Merge branch 'dev' into deprecate-retinotopy

NeurodataWithoutBorders · Jan 12, 2024 · d7b8e03 · d7b8e03
2 parents 596108f + b48ab12
commit d7b8e03
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/core/nwb.icephys.yaml b/core/nwb.icephys.yaml
@@ -286,6 +286,10 @@ groups:
   - name: stimulus
     neurodata_type_inc: TimeSeriesReferenceVectorData
     doc: Column storing the reference to the recorded stimulus for the recording (rows).
+  - name: stimulus_template
+    neurodata_type_inc: TimeSeriesReferenceVectorData
+    doc: Column storing the reference to the stimulus template for the recording (rows).
+    quantity: '?'
 
 - neurodata_type_def: IntracellularResponsesTable
   neurodata_type_inc: DynamicTable

diff --git a/core/nwb.ogen.yaml b/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

diff --git a/docs/format/source/format_release_notes.rst b/docs/format/source/format_release_notes.rst
@@ -10,6 +10,8 @@ Minor changes
 ^^^^^^^^^^^^^
 - Fixed typos in docstrings. (#560)
 - Deprecated `ImagingRetinotopy` neurodata type. (#565)
+- Modified `OptogeneticSeries` to allow 2D data, primarily in extensions of `OptogeneticSeries`. (#564)
+- Added optional ``stimulus_template`` column to ``IntracellularStimuliTable`` as part of the ``IntracellularRecordingsTable``. (#545)
 
 2.6.0 (January 17, 2023)
 -----------------------