From d9e028c965c3324dd585e511a7f884b406a0e9c0 Mon Sep 17 00:00:00 2001 From: Sam Bray Date: Wed, 23 Oct 2024 09:20:36 -0700 Subject: [PATCH 1/2] update neo_rarwio datatypes --- src/trodes_to_nwb/spike_gadgets_raw_io.py | 27 ++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/trodes_to_nwb/spike_gadgets_raw_io.py b/src/trodes_to_nwb/spike_gadgets_raw_io.py index a616c13..45536bc 100644 --- a/src/trodes_to_nwb/spike_gadgets_raw_io.py +++ b/src/trodes_to_nwb/spike_gadgets_raw_io.py @@ -201,7 +201,13 @@ def _parse_header(self): if stream_id not in stream_ids: stream_ids.append(stream_id) stream_name = stream_id - signal_streams.append((stream_name, stream_id)) + signal_streams.append( + ( + stream_name, + stream_id, + "", + ) + ) self._mask_channels_ids[stream_id] = [] self._mask_channels_bytes[stream_id] = [] self._mask_channels_bits[stream_id] = [] @@ -223,6 +229,7 @@ def _parse_header(self): gain, offset, stream_id, + "", ) ) @@ -242,7 +249,13 @@ def _parse_header(self): if stream_id not in stream_ids: stream_ids.append(stream_id) stream_name = stream_id - signal_streams.append((stream_name, stream_id)) + signal_streams.append( + ( + stream_name, + stream_id, + "", + ) + ) self._mask_channels_ids[stream_id] = [] self._mask_channels_bytes[stream_id] = [] self._mask_channels_bits[stream_id] = [] @@ -265,6 +278,7 @@ def _parse_header(self): gain, offset, stream_id, + "", ) ) @@ -290,7 +304,13 @@ def _parse_header(self): if num_ephy_channels > 0: stream_id = "trodes" stream_name = stream_id - signal_streams.append((stream_name, stream_id)) + signal_streams.append( + ( + stream_name, + stream_id, + "", + ) + ) self._mask_channels_bytes[stream_id] = [] channel_ids = self._produce_ephys_channel_ids( @@ -317,6 +337,7 @@ def _parse_header(self): gain, offset, stream_id, + "", ) ) From 5fc183291f76eb312ada3be3deabdd49436ccc2d Mon Sep 17 00:00:00 2001 From: Sam Bray Date: Wed, 23 Oct 2024 09:25:45 -0700 Subject: [PATCH 2/2] add minimum neo version number --- environment.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 244b23e..fc4c930 100644 --- a/environment.yml +++ b/environment.yml @@ -20,4 +20,4 @@ dependencies: - pip - pip: - ndx-franklab-novela - - neo + - neo>=0.13.4 diff --git a/pyproject.toml b/pyproject.toml index 36bb34e..bc83642 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "nwbinspector>=0.5.0", "ndx_franklab_novela", "pyyaml", - "neo", + "neo>=0.13.4", "dask[complete]", "ffmpeg", "jsonschema<4.21.0",