Skip to content

Update neuroshareios to neo 0.6 #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 5, 2018
Merged

Update neuroshareios to neo 0.6 #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45bccf2
Update neuroshareapiio to neo 0.6 structure
JuliaSprenger Dec 4, 2018
45f368c
Upadet neurosharectypesio to neo 0.6 structure
JuliaSprenger Dec 4, 2018
ab12b15
Pep8 fixes
JuliaSprenger Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions neo/io/neuroshareapiio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def __init__(self, filename=None, dllpath=None):
epochID = 3
# if a filename was given, create a dictionary with information that will
# be needed later on.
if self.filename != None:
if self.filename is not None:
if dllpath is not None:
name = os.path.splitext(os.path.basename(dllpath))[0]
library = ns.Library(name, dllpath)
Expand Down Expand Up @@ -222,19 +222,19 @@ def read_segment(self,
# read triggers (in this case without any duration)
for i in range(self.metadata["num_trigs"]):
# create event object for each trigger/bit found
eva = self.read_eventarray(channel_index=self.metadata["triggersId"][i],
eva = self.read_event(channel_index=self.metadata["triggersId"][i],
segment_duration=segment_duration,
t_start=t_start, )
# add event object to segment
seg.eventarrays += [eva]
seg.events += [eva]
# read epochs (digital events with duration)
for i in range(self.metadata["num_digiEpochs"]):
# create event object for each trigger/bit found
epa = self.read_epocharray(channel_index=self.metadata["digiEpochId"][i],
epa = self.read_epoch(channel_index=self.metadata["digiEpochId"][i],
segment_duration=segment_duration,
t_start=t_start, )
# add event object to segment
seg.epocharrays += [epa]
seg.epochs += [epa]
# read nested spiketrain
# run through all spike channels found
for i in range(self.metadata["num_spkChans"]):
Expand Down Expand Up @@ -352,7 +352,7 @@ def read_spiketrain(self,

return spiketr

def read_eventarray(self, lazy=False, channel_index=0,
def read_event(self, lazy=False, channel_index=0,
t_start=0.,
segment_duration=0.):
"""function to read digital timestamps. this function only reads the event
Expand Down Expand Up @@ -390,7 +390,7 @@ def read_eventarray(self, lazy=False, channel_index=0,
description="the trigger events (without durations)")
return eva

def read_epocharray(self, lazy=False,
def read_epoch(self, lazy=False,
channel_index=0,
t_start=0.,
segment_duration=0.):
Expand Down
4 changes: 2 additions & 2 deletions neo/io/neurosharectypesio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class NeurosharectypesIO(BaseIO):
...
>>> print seg.spiketrains
[]
>>> print seg.eventarrays
>>> print seg.events
[<EventArray: 1@1.12890625 s, 1@2.02734375 s, 1@3.82421875 s>]

Note:
Expand Down Expand Up @@ -198,7 +198,7 @@ def read_segment(self, import_neuroshare_segment=True,
ea.times = times * pq.s
ea.labels = np.array(labels, dtype='S')

seg.eventarrays.append(ea)
seg.events.append(ea)

# analog
if entity_types[entityInfo.dwEntityType] == 'ns_ENTITY_ANALOG':
Expand Down