Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OptogeneticSeries to allow 2D data #1812

Merged
merged 4 commits into from
Jan 11, 2024
Merged

Update OptogeneticSeries to allow 2D data #1812

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f47a63e
Update OptogeneticSeries to allow 2D data
rly Jan 4, 2024
7263748
Update changelog
rly Jan 4, 2024
d7e1667
Merge branch 'nwb-schema-2.7.0' into optogeneticseries_2d
rly Jan 11, 2024
ccc4538
Update src/pynwb/ogen.py
rly Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/pynwb/nwb-schema
Open in desktop
Submodule nwb-schema updated 24 files
+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
3 changes: 2 additions & 1 deletion src/pynwb/ogen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.'},
rly marked this conversation as resolved.
Show resolved Hide resolved
{'name': 'site', 'type': OptogeneticStimulusSite, # required
'doc': 'The site to which this stimulus was applied.'},
Expand Down