Skip to content

Make neuroshare robust for non-conform units #1122

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
samuelgarcia merged 1 commit into from
Jun 23, 2022
Merged

Make neuroshare robust for non-conform units #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion neo/io/neurosharectypesio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,12 @@ def read_segment(self, import_neuroshare_segment=True,
ctypes.POINTER(ctypes.c_double)))
total_read += pdwContCount.value

signal = pq.Quantity(pData, units=pAnalogInfo.szUnits.decode(), copy=False)
try:
signal = pq.Quantity(pData, units=pAnalogInfo.szUnits.decode(), copy=False)
unit_annotation = None
except LookupError:
signal = pq.Quantity(pData, units='dimensionless', copy=False)
unit_annotation = pAnalogInfo.szUnits.decode()

# t_start
dwIndex = 0
Expand All @@ -229,6 +234,8 @@ def read_segment(self, import_neuroshare_segment=True,
name=str(entityInfo.szEntityLabel),
)
anaSig.annotate(probe_info=str(pAnalogInfo.szProbeInfo))
if unit_annotation is not None:
anaSig.annotate(units=unit_annotation)
seg.analogsignals.append(anaSig)

# segment
Expand Down
12 changes: 6 additions & 6 deletions neo/test/iotest/test_neuroshareio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ def setUp(self):
raise unittest.SkipTest("Not currently supported on OS X")

def test_with_multichannel(self):
filename0 = self.get_local_path(self.files_to_test[0])
reader = NeuroshareIO(filename0, self.dllname)
blocks = reader.read()
n = len(blocks[0].segments[0].analogsignals)
assert n == 2, \
'For {} , nb AnalogSignal: {} (should be 2)'.format(self.files_to_download[0], n)
for filename in self.files_to_test:
filename = self.get_local_path(filename)
reader = NeuroshareIO(filename, self.dllname)
blocks = reader.read()
n = len(blocks[0].segments[0].analogsignals)
assert n > 0, f'Expect signals in file {filename}'


if __name__ == "__main__":
Expand Down