Skip to content

Commit

Permalink
Merge pull request #1806 from AllenInstitute/bugfix/deprecated-scipy-…
Browse files Browse the repository at this point in the history
…rotation-as-dcm

updates Rotation.as_dcm to as_matrix
  • Loading branch information
djkapner authored Jan 4, 2021
2 parents 9f64b72 + 0609647 commit 43c4fa2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Change Log
All notable changes to this project will be documented in this file.

## [2.4.1] = 2021-01-04
- update deprecated call to scipy.spatial.transform.Rotation.as_dcm() to .as_matrix()

## [2.4.0] = 2020-12-21
- When running raster_plot on a spike_times dataframe, the spike times from each unit are plotted twice. (thank you @dgmurx)
- improvements and fixes to behavior ophys NWB files.
Expand Down
2 changes: 1 addition & 1 deletion allensdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@



__version__ = '2.4.0'
__version__ = '2.4.1'


try:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def rig_component_fixture(request):
], indirect=['rig_component_fixture'])
def test_generate_self_to_eye_frame_xform(rig_component_fixture, expected):
obtained = rig_component_fixture.generate_self_to_eye_frame_xform()
assert np.allclose(obtained.as_dcm(), expected)
assert np.allclose(obtained.as_matrix(), expected)


# ======== GazeMapper tests ========
Expand Down Expand Up @@ -341,4 +341,4 @@ def test_project_to_plane(function_inputs, expected):
])
def test_generate_object_rotation_xform(function_inputs, expected):
obtained = gm.generate_object_rotation_xform(**function_inputs)
assert np.allclose(obtained.as_dcm(), expected)
assert np.allclose(obtained.as_matrix(), expected)

0 comments on commit 43c4fa2

Please sign in to comment.