add test and fix buffer slice

Author: h-mayorquin

neo/rawio/openephysbinaryrawio.py

@@ -223,12 +223,30 @@ def _parse_header(self):
                         raise ValueError(
                             "SYNC channel is not present in the recording. " "Set load_sync_channel to False"
                         )
-
-                    if has_sync_trace and not self.load_sync_channel:
-                        self._stream_buffer_slice[stream_id] = slice(None, -1)
+                    
+                    num_neural_channels = sum(1 for ch in info["channels"] if "ADC" not in ch["channel_name"])
+                    num_non_neural_channels = sum(1 for ch in info["channels"] if "ADC" in ch["channel_name"])
+                    
+    
+                    if num_non_neural_channels == 0:                        
+                        if has_sync_trace and not self.load_sync_channel:
+                            self._stream_buffer_slice[stream_id] = slice(None, -1)
+                        else:
+                            self._stream_buffer_slice[stream_id] = None
                     else:
-                        self._stream_buffer_slice[stream_id] = None
-
+                        # For ADC channels, we remove the last channel which is the Synch channel
+                        stream_id_neural = stream_id
+                        stream_id_non_neural = str(int(stream_id) + self._num_of_signal_streams)
+                        
+                        # Note this implementation assumes that the neural channels come before the non-neural channels
+
+                        self._stream_buffer_slice[stream_id_neural] = slice(0, num_neural_channels)
+                        self._stream_buffer_slice[stream_id_non_neural] = slice(num_neural_channels, None)
+                        
+                        # It also assumes that the synch channel is the last channel in the buffer
+                        if has_sync_trace and not self.load_sync_channel:
+                            self._stream_buffer_slice[stream_id_non_neural] = slice(num_neural_channels, -1)
+                        
         # events zone
         # channel map: one channel one stream
         event_channels = []

neo/test/rawiotest/test_openephysbinaryrawio.py

@@ -16,6 +16,7 @@ class TestOpenEphysBinaryRawIO(BaseTestRawIO, unittest.TestCase):
         "openephysbinary/v0.6.x_neuropixels_multiexp_multistream",
         "openephysbinary/v0.6.x_neuropixels_with_sync",
         "openephysbinary/v0.6.x_neuropixels_missing_folders",
+        "openephysbinary/neural_and_non_neural_data_mixed"
     ]
 
     def test_sync(self):
@@ -78,6 +79,16 @@ def test_multiple_ttl_events_parsing(self):
         assert np.allclose(ttl_events["durations"][ttl_events["labels"] == "6"], 0.025, atol=0.001)
         assert np.allclose(ttl_events["durations"][ttl_events["labels"] == "7"], 0.016666, atol=0.001)
 
+    def test_separating_stream_for_non_neural_data(self):
+        rawio = OpenEphysBinaryRawIO(
+            self.get_local_path("openephysbinary/neural_and_non_neural_data_mixed"), load_sync_channel=False
+        )
+        rawio.parse_header()
+        # Check that the non-neural data stream is correctly separated
+        assert len(rawio.header["signal_streams"]["name"]) == 2
+        assert rawio.header["signal_streams"]["name"] == ["'Rhythm_FPGA-100.0", "'Rhythm_FPGA-100.0_ADC"]
+
+
 
 if __name__ == "__main__":
     unittest.main()