Merge remote-tracking branch 'origin/nwb-schema-2.7.0' into add-stimu…

…lus-template-column
NeurodataWithoutBorders · Jan 11, 2024 · a7d1f56 · a7d1f56
2 parents a5bffdb + d0c4068
commit a7d1f56
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@
 
 ### Enhancements and minor changes
 - Added support for NWB schema 2.7.0.
-  - Support `stimulus_template` as optional predefined column in `IntracellularStimuliTable`. @stephprince [#1815](https://github.com/NeurodataWithoutBorders/pynwb/pull/1815)
   - ...
+  - Modified `OptogeneticSeries` to allow 2D data, primarily in extensions of `OptogeneticSeries`. @rly [#1812](https://github.com/NeurodataWithoutBorders/pynwb/pull/1812)
+  - Support `stimulus_template` as optional predefined column in `IntracellularStimuliTable`. @stephprince [#1815](https://github.com/NeurodataWithoutBorders/pynwb/pull/1815)
   - ...
   - ...
 - 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',