Merge branch 'master' into fixate_plexon2_streams

Author: h-mayorquin

neo/rawio/medrawio.py

@@ -240,7 +240,7 @@ def _get_analogsignal_chunk(self, block_index, seg_index, i_start, i_stop, strea
             self.sess.set_channel_active(self._stream_info[stream_index]["raw_chans"])
             num_channels = len(self._stream_info[stream_index]["raw_chans"])
             self.sess.set_reference_channel(self._stream_info[stream_index]["raw_chans"][0])
-        
+
         # in the case we have a slice or we give an ArrayLike we need to iterate through the channels
         # in order to activate them.
         else:

neo/rawio/plexon2rawio/plexon2rawio.py

@@ -166,7 +166,7 @@ def _parse_header(self):
         for channel_index in range(self.pl2reader.pl2_file_info.m_TotalNumberOfAnalogChannels):
             achannel_info = self.pl2reader.pl2_get_analog_channel_info(channel_index)
             # only consider active channels
-            if not achannel_info.m_ChannelEnabled:
+            if not (achannel_info.m_ChannelEnabled and achannel_info.m_ChannelRecordingEnabled):
                 continue
 
             # assign to matching stream or create new stream based on signal characteristics
@@ -228,7 +228,7 @@ def _parse_header(self):
             schannel_info = self.pl2reader.pl2_get_spike_channel_info(c)
 
             # only consider active channels
-            if not schannel_info.m_ChannelEnabled:
+            if not (schannel_info.m_ChannelEnabled and schannel_info.m_ChannelRecordingEnabled):
                 continue
 
             for channel_unit_id in range(schannel_info.m_NumberOfUnits):
@@ -252,7 +252,7 @@ def _parse_header(self):
             echannel_info = self.pl2reader.pl2_get_digital_channel_info(i)
 
             # only consider active channels
-            if not echannel_info.m_ChannelEnabled:
+            if not (echannel_info.m_ChannelEnabled and echannel_info.m_ChannelRecordingEnabled):
                 continue
 
             # event channels are characterized by (name, id, type), with type in ['event', 'epoch']

neo/test/iotest/test_plexonio.py

@@ -18,7 +18,7 @@ class TestPlexonIO(
         "plexon/File_plexon_1.plx",
         "plexon/File_plexon_2.plx",
         "plexon/File_plexon_3.plx",
-        "plexon/4chDemoPLX.plx"
+        "plexon/4chDemoPLX.plx",
     ]
 
 

neo/test/rawiotest/rawio_compliance.py

@@ -224,15 +224,15 @@ def read_analogsignals(reader):
             i_start=i_start,
             i_stop=i_stop,
             stream_index=stream_index,
-            channel_indexes=slice(None)
+            channel_indexes=slice(None),
         )
         raw_chunk_channel_indexes = reader.get_analogsignal_chunk(
             block_index=block_index,
             seg_index=seg_index,
             i_start=i_start,
             i_stop=i_stop,
             stream_index=stream_index,
-            channel_indexes=channel_indexes
+            channel_indexes=channel_indexes,
         )
 
         np.testing.assert_array_equal(raw_chunk_slice_none, raw_chunk_channel_indexes)

neo/test/rawiotest/test_plexonrawio.py

@@ -15,7 +15,7 @@ class TestPlexonRawIO(
         "plexon/File_plexon_1.plx",
         "plexon/File_plexon_2.plx",
         "plexon/File_plexon_3.plx",
-        "plexon/4chDemoPLX.plx"
+        "plexon/4chDemoPLX.plx",
     ]