Update OptogeneticSeries to allow 2D data (#1812)

Co-authored-by: Steph Prince <[email protected]>
NeurodataWithoutBorders · Jan 11, 2024 · d0c4068 · d0c4068
1 parent 5be83b6
commit d0c4068
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
 ### Enhancements and minor changes
 - Added support for NWB schema 2.7.0.
   - ...
-  - ...
+  - Modified `OptogeneticSeries` to allow 2D data, primarily in extensions of `OptogeneticSeries`. @rly [#1812](https://github.com/NeurodataWithoutBorders/pynwb/pull/1812)
   - ...
   - ...
 - For `NWBHDF5IO()`, change the default of arg `load_namespaces` from `False` to `True`. @bendichter [#1748](https://github.com/NeurodataWithoutBorders/pynwb/pull/1748)

diff --git a/src/pynwb/nwb-schema b/src/pynwb/nwb-schema
diff --git a/src/pynwb/ogen.py b/src/pynwb/ogen.py
@@ -37,8 +37,9 @@ class OptogeneticSeries(TimeSeries):
     __nwbfields__ = ('site',)
 
     @docval(*get_docval(TimeSeries.__init__, 'name'),  # required
-            {'name': 'data', 'type': ('array_data', 'data', TimeSeries), 'shape': (None, ),  # required
-             'doc': 'The data values over time. Must be 1D.'},
+            {'name': 'data', 'type': ('array_data', 'data', TimeSeries),  # required
+             'shape': [(None, ), (None, None)],
+             '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',
+3 −0		.codespellrc
+34 −0		.github/workflows/check_sphinx_links.yml
+19 −0		.github/workflows/codespell.yml
+3 −3		.github/workflows/validate_schema.yml
+2 −2		.gitignore
+2 −2		README.rst
+4 −4		core/nwb.file.yaml
+1 −1		core/nwb.image.yaml
+1 −1		core/nwb.namespace.yaml
+9 −3		core/nwb.ogen.yaml
+2 −2		core/nwb.ophys.yaml
+27 −0		docs/format/.readthedocs.yaml
+2 −2		docs/format/Makefile
+4 −4		docs/format/Readme.md
+1 −1		docs/format/make.bat
+3 −3		docs/format/source/conf.py
+1 −1		docs/format/source/conf_doc_autogen.py
+2 −2		docs/format/source/credits.rst
+2 −2		docs/format/source/format_description.rst
+52 −45		docs/format/source/format_release_notes.rst
+1 −1		docs/format/source/software_process.rst
+1 −1		docs/storage/Makefile
+6 −6		docs/storage/source/storage_release_notes.rst
+3 −0		requirements-doc.txt