Merge branch 'dev' into change/icephys_stimulus_template

Author: stephprince

core/nwb.ogen.yaml

@@ -6,10 +6,16 @@ groups:
   - name: data
     dtype: numeric
     dims:
-    - num_times
+    - - num_times
+    - - num_times
+      - num_rois
     shape:
-    - null
-    doc: Applied power for optogenetic stimulus, in watts.
+    - - null
+    - - null
+      - null
+    doc: Applied power for optogenetic stimulus, in watts. Shape can be 1D or 2D.
+      2D data is meant to be used in an extension of OptogeneticSeries that
+      defines what the second dimension represents.
     attributes:
     - name: unit
       dtype: text

docs/format/source/format_release_notes.rst

@@ -9,6 +9,7 @@ Release Notes
 Minor changes
 ^^^^^^^^^^^^^
 - Fixed typos in docstrings. (#560)
+- Modified `OptogeneticSeries` to allow 2D data, primarily in extensions of `OptogeneticSeries`. (#564)
 - Added optional ``stimulus_template`` column to ``IntracellularRecordingsTable`` (#545)
 
 2.6.0 (January 17, 2023)