wip buffer_id for more rawios

Author: samuelgarcia

neo/rawio/tdtrawio.py

@@ -36,6 +36,7 @@
     BaseRawIO,
     _signal_channel_dtype,
     _signal_stream_dtype,
+    _signal_buffer_dtype,
     _spike_channel_dtype,
     _event_channel_dtype,
 )
@@ -208,7 +209,8 @@ def _parse_header(self):
 
             stream_name = str(info["StoreName"])
             stream_id = f"{stream_index}"
-            signal_streams.append((stream_name, stream_id))
+            buffer_id = ""
+            signal_streams.append((stream_name, stream_id, buffer_id))
 
             for c in range(info["NumChan"]):
                 global_chan_index = len(signal_channels)
@@ -308,13 +310,16 @@ def _parse_header(self):
                 units = "uV"  # see https://github.com/NeuralEnsemble/python-neo/issues/1369
                 gain = 1.0
                 offset = 0.0
-                signal_channels.append((chan_name, str(chan_id), sampling_rate, dtype, units, gain, offset, stream_id))
+                buffer_id = ""
+                signal_channels.append((chan_name, str(chan_id), sampling_rate, dtype, units, gain, offset, stream_id, buffer_id))
 
         if missing_sev_channels:
             warnings.warn(f"Could not identify sev files for channels {missing_sev_channels}.")
 
         signal_streams = np.array(signal_streams, dtype=_signal_stream_dtype)
         signal_channels = np.array(signal_channels, dtype=_signal_channel_dtype)
+        # buffer concept here, data are spread per channel and paquet
+        signal_buffers = np.array([], dtype=_signal_buffer_dtype)
 
         # unit channels EVTYPE_SNIP
         self.internal_unit_ids = {}
@@ -365,6 +370,7 @@ def _parse_header(self):
         self.header = {}
         self.header["nb_block"] = 1
         self.header["nb_segment"] = [nb_segment]
+        self.header["signal_buffers"] = signal_buffers
         self.header["signal_streams"] = signal_streams
         self.header["signal_channels"] = signal_channels
         self.header["spike_channels"] = spike_channels

neo/rawio/winedrrawio.py

@@ -15,6 +15,7 @@
     BaseRawIO,
     _signal_channel_dtype,
     _signal_stream_dtype,
+    _signal_buffer_dtype,
     _spike_channel_dtype,
     _event_channel_dtype,
     _common_sig_characteristics,
@@ -92,7 +93,8 @@ def _parse_header(self):
             gain = AD / (YCF * YAG * (ADCMAX + 1))
             offset = -YZ * gain
             stream_id = "0"
-            signal_channels.append((name, str(chan_id), self._sampling_rate, "int16", units, gain, offset, stream_id))
+            buffer_id = "0"
+            signal_channels.append((name, str(chan_id), self._sampling_rate, "int16", units, gain, offset, stream_id, buffer_id))
 
         signal_channels = np.array(signal_channels, dtype=_signal_channel_dtype)
 
@@ -102,9 +104,14 @@ def _parse_header(self):
         for i in range(unique_characteristics.size):
             mask = unique_characteristics[i] == characteristics
             signal_channels["stream_id"][mask] = str(i)
-            signal_streams.append((f"stream {i}", str(i)))
+            # unique buffer for all streams    
+            buffer_id = "0"
+            signal_streams.append((f"stream {i}", str(i), buffer_id))
         signal_streams = np.array(signal_streams, dtype=_signal_stream_dtype)
 
+        # all stream are in the same unique buffer : memmap
+        signal_buffers = np.array([("", "0")], dtype=_signal_buffer_dtype)
+
         # No events
         event_channels = []
         event_channels = np.array(event_channels, dtype=_event_channel_dtype)
@@ -117,6 +124,7 @@ def _parse_header(self):
         self.header = {}
         self.header["nb_block"] = 1
         self.header["nb_segment"] = [1]
+        self.header["signal_buffers"] = signal_buffers
         self.header["signal_streams"] = signal_streams
         self.header["signal_channels"] = signal_channels
         self.header["spike_channels"] = spike_channels

neo/rawio/winwcprawio.py

@@ -16,6 +16,7 @@
     BaseRawIO,
     _signal_channel_dtype,
     _signal_stream_dtype,
+    _signal_buffer_dtype,
     _spike_channel_dtype,
     _event_channel_dtype,
     _common_sig_characteristics,
@@ -35,7 +36,6 @@ class WinWcpRawIO(BaseRawIO):
 
     extensions = ["wcp"]
     rawmode = "one-file"
-    has_buffer_description_api = True
 
     def __init__(self, filename=""):
         BaseRawIO.__init__(self)
@@ -49,9 +49,7 @@ def _parse_header(self):
 
         # only one memmap for all segment to avoid
         # "error: [Errno 24] Too many open files"
-        # self._memmap = np.memmap(self.filename, dtype="uint8", mode="r")
-
-        self._buffer_descriptions = {0 :{}}
+        self._memmap = np.memmap(self.filename, dtype="uint8", mode="r")
 
         with open(self.filename, "rb") as fid:
 
@@ -120,7 +118,8 @@ def _parse_header(self):
             gain = VMax / ADCMAX / YG
             offset = 0.0
             stream_id = "0"
-            signal_channels.append((name, chan_id, self._sampling_rate, "int16", units, gain, offset, stream_id))
+            buffer_id = "0"
+            signal_channels.append((name, chan_id, self._sampling_rate, "int16", units, gain, offset, stream_id, buffer_id))
 
         signal_channels = np.array(signal_channels, dtype=_signal_channel_dtype)
 
@@ -130,9 +129,14 @@ def _parse_header(self):
         for i in range(unique_characteristics.size):
             mask = unique_characteristics[i] == characteristics
             signal_channels["stream_id"][mask] = str(i)
-            signal_streams.append((f"stream {i}", str(i)))
+            # unique buffer for all streams    
+            buffer_id = "0"
+            signal_streams.append((f"stream {i}", str(i), buffer_id))
         signal_streams = np.array(signal_streams, dtype=_signal_stream_dtype)
 
+        # all stream are in the same unique buffer : memmap
+        signal_buffers = np.array([("", "0")], dtype=_signal_buffer_dtype)
+
         # No events
         event_channels = []
         event_channels = np.array(event_channels, dtype=_event_channel_dtype)
@@ -145,6 +149,7 @@ def _parse_header(self):
         self.header = {}
         self.header["nb_block"] = 1
         self.header["nb_segment"] = [nb_segment]
+        self.header["signal_buffers"] = signal_buffers
         self.header["signal_streams"] = signal_streams
         self.header["signal_channels"] = signal_channels
         self.header["spike_channels"] = spike_channels