Merge pull request #1415 from h-mayorquin/small_changes_to_intan

IntanRawIO: Change channel id to native-channel-name in intan

Author: zm711

neo/rawio/intanrawio.py

@@ -104,8 +104,8 @@ def _parse_header(self):
         # signals
         signal_channels = []
         for c, chan_info in enumerate(self._ordered_channels):
-            name = chan_info["native_channel_name"]
-            chan_id = str(c)  # the chan_id have no meaning in intan
+            name = chan_info["custom_channel_name"]
+            channel_id = chan_info["native_channel_name"]
             if chan_info["signal_type"] == 20:
                 # exception for temperature
                 sig_dtype = "int16"
@@ -115,7 +115,7 @@ def _parse_header(self):
             signal_channels.append(
                 (
                     name,
-                    chan_id,
+                    channel_id,
                     chan_info["sampling_rate"],
                     sig_dtype,
                     chan_info["units"],
@@ -165,9 +165,9 @@ def _get_signal_size(self, block_index, seg_index, stream_index):
         stream_id = self.header["signal_streams"][stream_index]["id"]
         mask = self.header["signal_channels"]["stream_id"] == stream_id
         signal_channels = self.header["signal_channels"][mask]
-        channel_names = signal_channels["name"]
-        chan_name0 = channel_names[0]
-        size = self._raw_data[chan_name0].size
+        channel_ids = signal_channels["id"]
+        channel_id_0 = channel_ids[0]
+        size = self._raw_data[channel_id_0].size
         return size
 
     def _get_signal_t_start(self, block_index, seg_index, stream_index):
@@ -185,9 +185,9 @@ def _get_analogsignal_chunk(self, block_index, seg_index, i_start, i_stop, strea
         signal_channels = self.header["signal_channels"][mask]
         if channel_indexes is None:
             channel_indexes = slice(None)
-        channel_names = signal_channels["name"][channel_indexes]
+        channel_ids = signal_channels["id"][channel_indexes]
 
-        shape = self._raw_data[channel_names[0]].shape
+        shape = self._raw_data[channel_ids[0]].shape
 
         # some channel (temperature) have 1D field so shape 1D
         # because 1 sample per block
@@ -200,13 +200,14 @@ def _get_analogsignal_chunk(self, block_index, seg_index, i_start, i_stop, strea
             sl0 = i_start % block_size
             sl1 = sl0 + (i_stop - i_start)
 
-        sigs_chunk = np.zeros((i_stop - i_start, len(channel_names)), dtype="uint16")
-        for i, chan_name in enumerate(channel_names):
-            data_chan = self._raw_data[chan_name]
+        sigs_chunk = np.zeros((i_stop - i_start, len(channel_ids)), dtype="uint16")
+        for channel_index, channel_id in enumerate(channel_ids):
+            # Memmap fields are the channel_ids for unique channels
+            data_chan = self._raw_data[channel_id]
             if len(shape) == 1:
-                sigs_chunk[:, i] = data_chan[i_start:i_stop]
+                sigs_chunk[:, channel_index] = data_chan[i_start:i_stop]
             else:
-                sigs_chunk[:, i] = data_chan[block_start:block_stop].flatten()[sl0:sl1]
+                sigs_chunk[:, channel_index] = data_chan[block_start:block_stop].flatten()[sl0:sl1]
 
         return sigs_chunk