Skip to content

Improve xarray compatibility in vector utilities (compute_signed_angle_2d and cart2pol) [fixes #901] #902

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

Open
swagat-mishra28 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve xarray compatibility in vector utilities (compute_signed_angle_2d and cart2pol) [fixes #901] #902

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions movement/utils/vector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def cart2pol(data: xr.DataArray) -> xr.DataArray:
# Make all zeros in phi positive zeros
# - where rho == 0, set phi to 0
# - where rho != 0, keep the phi value from atan2
phi = xr.where(np.isclose(rho.values, 0.0, atol=1e-9), 0.0, phi)
phi = xr.where(np.isclose(rho, 0.0, atol=1e-9), 0.0, phi)

# Replace space dim with space_pol
dims = list(data.dims)
Expand Down Expand Up @@ -298,11 +298,12 @@ def compute_signed_angle_2d(
cross *= -1.0
dot = u_x * v_x + u_y * v_y

angles = np.arctan2(cross, dot)
assert isinstance(angles, xr.DataArray)
angles = xr.apply_ufunc(np.arctan2, cross, dot)

# arctan2 returns values in [-pi, pi].
# We need to map -pi angles to pi, to stay in the (-pi, pi] range
angles.values[angles <= -np.pi] = np.pi
# Map -pi angles to pi to stay in the (-pi, pi] range
angles = xr.where(angles <= -np.pi, np.pi, angles)

angles.name = "signed_angle"
return angles

Expand Down