From f47a63ee6220415819911215c4b2e091807fd953 Mon Sep 17 00:00:00 2001 From: rly Date: Thu, 4 Jan 2024 11:16:23 -0800 Subject: [PATCH 1/3] Update OptogeneticSeries to allow 2D data --- src/pynwb/nwb-schema | 2 +- src/pynwb/ogen.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pynwb/nwb-schema b/src/pynwb/nwb-schema index b4f8838cb..b8806738f 160000 --- a/src/pynwb/nwb-schema +++ b/src/pynwb/nwb-schema @@ -1 +1 @@ -Subproject commit b4f8838cbfbb7f8a117bd7e0aad19133d26868b4 +Subproject commit b8806738fa0d125970459628d81e0c18da896a1f diff --git a/src/pynwb/ogen.py b/src/pynwb/ogen.py index f410b4235..01763c2da 100644 --- a/src/pynwb/ogen.py +++ b/src/pynwb/ogen.py @@ -37,7 +37,8 @@ class OptogeneticSeries(TimeSeries): __nwbfields__ = ('site',) @docval(*get_docval(TimeSeries.__init__, 'name'), # required - {'name': 'data', 'type': ('array_data', 'data', TimeSeries), 'shape': (None, ), # required + {'name': 'data', 'type': ('array_data', 'data', TimeSeries), # required + 'shape': [(None, ), (None, None)], 'doc': 'The data values over time. Must be 1D.'}, {'name': 'site', 'type': OptogeneticStimulusSite, # required 'doc': 'The site to which this stimulus was applied.'}, From 7263748d7bf6d7512584595eaf8e1ee259e88eb5 Mon Sep 17 00:00:00 2001 From: rly Date: Thu, 4 Jan 2024 11:19:47 -0800 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5cfa5a9e..457ab0f60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## PyNWB 2.6.0 (Upcoming) ### Enhancements and minor changes +- Added support for NWB 2.7.0. @rly + - Modified `OptogeneticSeries` to allow 2D data, primarily in extensions of `OptogeneticSeries`. - For `NWBHDF5IO()`, change the default of arg `load_namespaces` from `False` to `True`. @bendichter [#1748](https://github.com/NeurodataWithoutBorders/pynwb/pull/1748) - Add `NWBHDF5IO.can_read()`. @bendichter [#1703](https://github.com/NeurodataWithoutBorders/pynwb/pull/1703) - Add `pynwb.get_nwbfile_version()`. @bendichter [#1703](https://github.com/NeurodataWithoutBorders/pynwb/pull/1703) From ccc453886fdd9eb2a1556c81e0aa6574fe993c8b Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Thu, 11 Jan 2024 15:18:37 -0800 Subject: [PATCH 3/3] Update src/pynwb/ogen.py Co-authored-by: Steph Prince <40640337+stephprince@users.noreply.github.com> --- src/pynwb/ogen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pynwb/ogen.py b/src/pynwb/ogen.py index 01763c2da..af11842e4 100644 --- a/src/pynwb/ogen.py +++ b/src/pynwb/ogen.py @@ -39,7 +39,7 @@ class OptogeneticSeries(TimeSeries): @docval(*get_docval(TimeSeries.__init__, 'name'), # required {'name': 'data', 'type': ('array_data', 'data', TimeSeries), # required 'shape': [(None, ), (None, None)], - 'doc': 'The data values over time. Must be 1D.'}, + 'doc': 'The data values over time.'}, {'name': 'site', 'type': OptogeneticStimulusSite, # required 'doc': 'The site to which this stimulus was applied.'}, *get_docval(TimeSeries.__init__, 'resolution', 'conversion', 'timestamps', 'starting_time', 'rate',