Merge pull request #1122 from JuliaSprenger/enh/neuroshare

Make neuroshare robust for non-conform units

Author: samuelgarcia

neo/io/neurosharectypesio.py

@@ -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
@@ -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

neo/test/iotest/test_neuroshareio.py

@@ -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__":