Fix tests

Author: alejoe91

neo/rawio/spikeglxrawio.py

@@ -290,8 +290,7 @@ def _get_analogsignal_chunk(self, block_index, seg_index, i_start, i_stop, strea
         return raw_signals
 
     def _event_count(self, event_channel_idx, block_index=None, seg_index=None):
-        timestamps, _, _ = self._get_event_timestamps(block_index, seg_index, event_channel_index,
-                                                      None, None)
+        timestamps, _, _ = self._get_event_timestamps(block_index, seg_index, event_channel_idx, None, None)
         return timestamps.size
 
     def _get_event_timestamps(self, block_index, seg_index, event_channel_index, t_start=None, t_stop=None):
@@ -304,7 +303,7 @@ def _get_event_timestamps(self, block_index, seg_index, event_channel_index, t_s
             ch_idx = 7 - int(channel[2:]) # They are in the reverse order
             this_stream = event_data[:,ch_idx]
             this_rising = np.where(np.diff(this_stream)==1)[0] + 1
-            this_falling = np.where(np.diff(this_stream)==255)[0] + 1 #behcause the data is in unsigned 8 bit, -1 = 255!
+            this_falling = np.where(np.diff(this_stream)==255)[0] + 1 # because the data is in unsigned 8 bit, -1 = 255!
             if len(this_rising) > 0:
                 timestamps.extend(this_rising)
                 labels.extend([channel + ' ON']*len(this_rising))

neo/test/rawiotest/test_spikeglxrawio.py

@@ -6,7 +6,7 @@
 
 from neo.rawio.spikeglxrawio import SpikeGLXRawIO
 from neo.test.rawiotest.common_rawio_test import BaseTestRawIO
-import numpy
+import numpy as np
 
 class TestSpikeGLXRawIO(BaseTestRawIO, unittest.TestCase):
     rawioclass = SpikeGLXRawIO
@@ -29,7 +29,6 @@ class TestSpikeGLXRawIO(BaseTestRawIO, unittest.TestCase):
         "spikeglx/NP2_with_sync",
         "spikeglx/NP2_no_sync",
         "spikeglx/NP2_subset_with_sync",
-        "spikeglx/DigitalChannelTest_g0",
     ]
 
     def test_with_location(self):
@@ -87,19 +86,19 @@ def test_subset_with_sync(self):
         assert chunk.shape[1] == 120
 
     def test_nidq_digital_channel(self):
-        rawio_digital = SpikeGLXRawIO("spikeglx/DigitalChannelTest_g0")
+        rawio_digital = SpikeGLXRawIO(self.get_local_path("spikeglx/DigitalChannelTest_g0"))
         rawio_digital.parse_header()
         # This data should have 8 event channels
         assert(np.shape(rawio_digital.header['event_channels'])[0] == 8)
 
         # Channel 0 in this data will have sync pulses at 1 Hz, let's confirm that
-        all_events = rawio_digital.get_event_timestamps(0,0,0)
+        all_events = rawio_digital.get_event_timestamps(0, 0, 0)
         on_events = np.where(all_events[2] == 'XD0 ON')
-        on_ts = this_events[0][on_events]
-        on_diff = np.unique(np.diff(on_ts))
-        for diff in this_on_diff:
-            error = 0.0001*rawio_digital.get_signal_sampling_rate()
-            assert abs(diff - rawio_digital.get_signal_sampling_rate()) < error
+        on_ts = all_events[0][on_events]
+        on_ts_scaled = rawio_digital.rescale_event_timestamp(on_ts)
+        on_diff = np.diff(on_ts_scaled)
+        atol = 0.001
+        assert np.allclose(on_diff, 1, atol=atol)        
 
 if __name__ == "__main__":
     unittest.main()