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.

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

Temporarily revert fix for SpatialSeries.bounds #1996

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

### Enhancements and minor changes
- Added support for NWB schema 2.8.0:
- Fixed support for `data__bounds` field to `SpatialSeries` to set optional boundary range (min, max) for each dimension of data. Removed `SpatialSeries.bounds` field that was not functional. @rly [#1907](https://github.com/NeurodataWithoutBorders/pynwb/pull/1907)
- Removed `SpatialSeries.bounds` field that was not functional. This will be fixed in a future release. @rly [#1907](https://github.com/NeurodataWithoutBorders/pynwb/pull/1907),

## PyNWB 2.8.3 (Upcoming)

Expand Down
4 changes: 0 additions & 4 deletions docs/gallery/domain/plot_behavior.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,13 @@
#
# For position data ``reference_frame`` indicates the zero-position, e.g.
# the 0,0 point might be the bottom-left corner of an enclosure, as viewed from the tracking camera.
# In :py:class:`~pynwb.behavior.SpatialSeries`, the ``data__bounds`` field allows the user to set
# the boundary range, i.e., (min, max), for each dimension of ``data``. The units are the same as in ``data``.
# This field does not enforce a boundary on the dataset itself.

timestamps = np.linspace(0, 50) / 200

position_spatial_series = SpatialSeries(
name="SpatialSeries",
description="Position (x, y) in an open field.",
data=position_data,
data__bounds=[(0,50), (0,50)],
timestamps=timestamps,
reference_frame="(0,0) is bottom left corner",
)
Expand Down
9 changes: 3 additions & 6 deletions src/pynwb/behavior.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ class SpatialSeries(TimeSeries):
tracking camera. The unit of data will indicate how to interpret SpatialSeries values.
"""

__nwbfields__ = ('data__bounds', 'reference_frame',)
__nwbfields__ = ('reference_frame',)

@docval(*get_docval(TimeSeries.__init__, 'name'), # required
{'name': 'data', 'type': ('array_data', 'data', TimeSeries), 'shape': ((None, ), (None, None)), # required
'doc': ('The data values. Can be 1D or 2D. The first dimension must be time. If 2D, there can be 1, 2, '
'or 3 columns, which represent x, y, and z.')},
{'name': 'data__bounds', 'type': ('data', 'array_data'), 'shape': ((1, 2), (2, 2), (3, 2)), 'default': None,
'doc': 'The boundary range (min, max) for each dimension of data.'},
{'name': 'reference_frame', 'type': str,
'doc': 'description defining what the zero-position is', 'default': None},
{'name': 'unit', 'type': str, 'doc': 'The base unit of measurement (should be SI unit)',
Expand All @@ -38,8 +36,8 @@ def __init__(self, **kwargs):
"""
Create a SpatialSeries TimeSeries dataset
"""
name, data, data__bounds, reference_frame, unit = popargs(
'name', 'data', 'data__bounds', 'reference_frame', 'unit', kwargs
name, data, reference_frame, unit = popargs(
'name', 'data', 'reference_frame', 'unit', kwargs
)
super().__init__(name, data, unit, **kwargs)

Expand All @@ -51,7 +49,6 @@ def __init__(self, **kwargs):
"The second dimension should have length <= 3 to represent at most x, y, z." %
(name, str(data_shape)))

self.data__bounds = data__bounds
self.reference_frame = reference_frame

@staticmethod
Expand Down
1 change: 0 additions & 1 deletion tests/integration/hdf5/test_behavior.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ def setUpContainer(self):
return SpatialSeries(
name='test_sS',
data=np.ones((3, 2)),
data__bounds=[(-1,1),(-1,1),(-1,1)],
reference_frame='reference_frame',
timestamps=[1., 2., 3.]
)
Expand Down
3 changes: 0 additions & 3 deletions tests/unit/test_behavior.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ def test_init(self):
sS = SpatialSeries(
name='test_sS',
data=np.ones((3, 2)),
data__bounds=[(-1,1),(-1,1),(-1,1)],
reference_frame='reference_frame',
timestamps=[1., 2., 3.]
)
self.assertEqual(sS.name, 'test_sS')
self.assertEqual(sS.unit, 'meters')
self.assertEqual(sS.data__bounds, [(-1,1),(-1,1),(-1,1)])
self.assertEqual(sS.reference_frame, 'reference_frame')

def test_init_minimum(self):
Expand All @@ -27,7 +25,6 @@ def test_init_minimum(self):
data=np.ones((3, 2)),
timestamps=[1., 2., 3.]
)
assert sS.bounds is None
assert sS.reference_frame is None

def test_set_unit(self):
Expand Down
Loading