-
Notifications
You must be signed in to change notification settings - Fork 86
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.
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
Add optional parameters to OpticalSeries constructor #2023
Open
bendichter
wants to merge
4
commits into
dev
Choose a base branch
from
fix/optical-series-optional-fields
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
d3ac85f
Add optional parameters to OpticalSeries constructor and correspondin…
bendichter d35b53c
Update CHANGELOG to reflect bug fixes and enhancements for OpticalSeries
bendichter cb17d08
Add test for roundtrip of OpticalSeries with optional fields
bendichter add7b31
Merge branch 'dev' into fix/optical-series-optional-fields
bendichter File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
|
||
import numpy as np | ||
|
||
from pynwb import TimeSeries | ||
from pynwb import TimeSeries, NWBHDF5IO | ||
from pynwb.base import Image, Images, ImageReferences | ||
from pynwb.device import Device | ||
from pynwb.image import ( | ||
|
@@ -396,6 +396,54 @@ def test_init(self): | |
self.assertEqual(ts.format, 'external') | ||
|
||
|
||
def test_init_all_optional_fields_none(self): | ||
"""Test that OpticalSeries can be created with all optional fields set to None.""" | ||
ts = OpticalSeries( | ||
name="test_ts", | ||
unit="unit", | ||
external_file=["external_file"], | ||
starting_frame=[0], | ||
format="external", | ||
timestamps=[1.0, 2.0], | ||
) | ||
self.assertIsNone(ts.distance) | ||
self.assertIsNone(ts.field_of_view) | ||
self.assertIsNone(ts.orientation) | ||
|
||
def test_roundtrip_optional_fields(self): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you move this test to This test is currently failing in Windows due to a file access issue. The |
||
"""Test that OpticalSeries with optional fields set to None can be written to and read from file.""" | ||
from datetime import datetime | ||
import tempfile | ||
from pynwb import NWBFile | ||
|
||
nwbfile = NWBFile( | ||
session_description='test session', | ||
identifier='TEST123', | ||
session_start_time=datetime.now().astimezone() | ||
) | ||
|
||
# Create OpticalSeries without providing the optional fields | ||
ts = OpticalSeries( | ||
name="test_ts", | ||
unit="unit", | ||
external_file=["external_file"], | ||
starting_frame=[0], | ||
format="external", | ||
timestamps=[1.0, 2.0] | ||
) | ||
|
||
nwbfile.add_acquisition(ts) | ||
|
||
with tempfile.NamedTemporaryFile(suffix='.nwb') as temp: | ||
with NWBHDF5IO(temp.name, mode='w') as io: | ||
io.write(nwbfile) | ||
with NWBHDF5IO(temp.name, mode='r', load_namespaces=True) as io: | ||
nwbfile_read = io.read() | ||
ts_read = nwbfile_read.acquisition['test_ts'] | ||
self.assertIsNone(ts_read.distance) | ||
self.assertIsNone(ts_read.field_of_view) | ||
self.assertIsNone(ts_read.orientation) | ||
|
||
class TestImageSubtypes(TestCase): | ||
|
||
def test_grayscale_image(self): | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a roundtrip test to make sure read/write is ok?