Skip to content

Fix issue raised in #104, incorrect deltaangle. #105

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

Merged
merged 1 commit into from
May 17, 2021
Merged

Fix issue raised in #104, incorrect deltaangle. #105

Show file tree
Hide file tree
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
186 changes: 152 additions & 34 deletions src/vector/_compute/spatial/deltaangle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import numpy

from vector._compute.spatial import dot
from vector._compute.spatial import dot, mag
from vector._methods import (
AzimuthalRhoPhi,
AzimuthalXY,
Expand All @@ -30,162 +30,280 @@


def xy_z_xy_z(lib, x1, y1, z1, x2, y2, z2):
return lib.arccos(dot.xy_z_xy_z(lib, x1, y1, z1, x2, y2, z2))
v1m = mag.xy_z(lib, x1, y1, z1)
v2m = mag.xy_z(lib, x2, y2, z2)
return lib.arccos(dot.xy_z_xy_z(lib, x1, y1, z1, x2, y2, z2) / v1m / v2m)


def xy_z_xy_theta(lib, x1, y1, z1, x2, y2, theta2):
return lib.arccos(dot.xy_z_xy_theta(lib, x1, y1, z1, x2, y2, theta2))
v1m = mag.xy_z(lib, x1, y1, z1)
v2m = mag.xy_theta(lib, x2, y2, theta2)
return lib.arccos(dot.xy_z_xy_theta(lib, x1, y1, z1, x2, y2, theta2) / v1m / v2m)


def xy_z_xy_eta(lib, x1, y1, z1, x2, y2, eta2):
return lib.arccos(dot.xy_z_xy_eta(lib, x1, y1, z1, x2, y2, eta2))
v1m = mag.xy_z(lib, x1, y1, z1)
v2m = mag.xy_eta(lib, x2, y2, eta2)
return lib.arccos(dot.xy_z_xy_eta(lib, x1, y1, z1, x2, y2, eta2) / v1m / v2m)


def xy_z_rhophi_z(lib, x1, y1, z1, rho2, phi2, z2):
return lib.arccos(dot.xy_z_rhophi_z(lib, x1, y1, z1, rho2, phi2, z2))
v1m = mag.xy_z(lib, x1, y1, z1)
v2m = mag.rhophi_z(lib, rho2, phi2, z2)
return lib.arccos(dot.xy_z_rhophi_z(lib, x1, y1, z1, rho2, phi2, z2) / v1m / v2m)


def xy_z_rhophi_theta(lib, x1, y1, z1, rho2, phi2, theta2):
return lib.arccos(dot.xy_z_rhophi_theta(lib, x1, y1, z1, rho2, phi2, theta2))
v1m = mag.xy_z(lib, x1, y1, z1)
v2m = mag.rhophi_theta(lib, rho2, phi2, theta2)
return lib.arccos(
dot.xy_z_rhophi_theta(lib, x1, y1, z1, rho2, phi2, theta2) / v1m / v2m
)


def xy_z_rhophi_eta(lib, x1, y1, z1, rho2, phi2, eta2):
return lib.arccos(dot.xy_z_rhophi_eta(lib, x1, y1, z1, rho2, phi2, eta2))
v1m = mag.xy_z(lib, x1, y1, z1)
v2m = mag.rhophi_eta(lib, rho2, phi2, eta2)
return lib.arccos(
dot.xy_z_rhophi_eta(lib, x1, y1, z1, rho2, phi2, eta2) / v1m / v2m
)


def xy_theta_xy_z(lib, x1, y1, theta1, x2, y2, z2):
return lib.arccos(dot.xy_theta_xy_z(lib, x1, y1, theta1, x2, y2, z2))
v1m = mag.xy_theta(lib, x1, y1, theta1)
v2m = mag.xy_z(lib, x2, y2, z2)
return lib.arccos(dot.xy_theta_xy_z(lib, x1, y1, theta1, x2, y2, z2) / v1m / v2m)


def xy_theta_xy_theta(lib, x1, y1, theta1, x2, y2, theta2):
return lib.arccos(dot.xy_theta_xy_theta(lib, x1, y1, theta1, x2, y2, theta2))
v1m = mag.xy_theta(lib, x1, y1, theta1)
v2m = mag.xy_theta(lib, x2, y2, theta2)
return lib.arccos(
dot.xy_theta_xy_theta(lib, x1, y1, theta1, x2, y2, theta2) / v1m / v2m
)


def xy_theta_xy_eta(lib, x1, y1, theta1, x2, y2, eta2):
return lib.arccos(dot.xy_theta_xy_eta(lib, x1, y1, theta1, x2, y2, eta2))
v1m = mag.xy_theta(lib, x1, y1, theta1)
v2m = mag.xy_eta(lib, x2, y2, eta2)
return lib.arccos(
dot.xy_theta_xy_eta(lib, x1, y1, theta1, x2, y2, eta2) / v1m / v2m
)


def xy_theta_rhophi_z(lib, x1, y1, theta1, rho2, phi2, z2):
return lib.arccos(dot.xy_theta_rhophi_z(lib, x1, y1, theta1, rho2, phi2, z2))
v1m = mag.xy_theta(lib, x1, y1, theta1)
v2m = mag.rhophi_z(lib, rho2, phi2, z2)
return lib.arccos(
dot.xy_theta_rhophi_z(lib, x1, y1, theta1, rho2, phi2, z2) / v1m / v2m
)


def xy_theta_rhophi_theta(lib, x1, y1, theta1, rho2, phi2, theta2):
v1m = mag.xy_theta(lib, x1, y1, theta1)
v2m = mag.rhophi_theta(lib, rho2, phi2, theta2)
return lib.arccos(
dot.xy_theta_rhophi_theta(lib, x1, y1, theta1, rho2, phi2, theta2)
dot.xy_theta_rhophi_theta(lib, x1, y1, theta1, rho2, phi2, theta2) / v1m / v2m
)


def xy_theta_rhophi_eta(lib, x1, y1, theta1, rho2, phi2, eta2):
return lib.arccos(dot.xy_theta_rhophi_eta(lib, x1, y1, theta1, rho2, phi2, eta2))
v1m = mag.xy_theta(lib, x1, y1, theta1)
v2m = mag.rhophi_eta(lib, rho2, phi2, eta2)
return lib.arccos(
dot.xy_theta_rhophi_eta(lib, x1, y1, theta1, rho2, phi2, eta2) / v1m / v2m
)


def xy_eta_xy_z(lib, x1, y1, eta1, x2, y2, z2):
return lib.arccos(dot.xy_eta_xy_z(lib, x1, y1, eta1, x2, y2, z2))
v1m = mag.xy_eta(lib, x1, y1, eta1)
v2m = mag.xy_z(lib, x2, y2, z2)
return lib.arccos(dot.xy_eta_xy_z(lib, x1, y1, eta1, x2, y2, z2) / v1m / v2m)


def xy_eta_xy_theta(lib, x1, y1, eta1, x2, y2, theta2):
return lib.arccos(dot.xy_eta_xy_theta(lib, x1, y1, eta1, x2, y2, theta2))
v1m = mag.xy_eta(lib, x1, y1, eta1)
v2m = mag.xy_theta(lib, x2, y2, theta2)
return lib.arccos(
dot.xy_eta_xy_theta(lib, x1, y1, eta1, x2, y2, theta2) / v1m / v2m
)


def xy_eta_xy_eta(lib, x1, y1, eta1, x2, y2, eta2):
return lib.arccos(dot.xy_eta_xy_eta(lib, x1, y1, eta1, x2, y2, eta2))
v1m = mag.xy_eta(lib, x1, y1, eta1)
v2m = mag.xy_eta(lib, x2, y2, eta2)
return lib.arccos(dot.xy_eta_xy_eta(lib, x1, y1, eta1, x2, y2, eta2) / v1m / v2m)


def xy_eta_rhophi_z(lib, x1, y1, eta1, rho2, phi2, z2):
return lib.arccos(dot.xy_eta_rhophi_z(lib, x1, y1, eta1, rho2, phi2, z2))
v1m = mag.xy_eta(lib, x1, y1, eta1)
v2m = mag.rhophi_z(lib, rho2, phi2, z2)
return lib.arccos(
dot.xy_eta_rhophi_z(lib, x1, y1, eta1, rho2, phi2, z2) / v1m / v2m
)


def xy_eta_rhophi_theta(lib, x1, y1, eta1, rho2, phi2, theta2):
return lib.arccos(dot.xy_eta_rhophi_theta(lib, x1, y1, eta1, rho2, phi2, theta2))
v1m = mag.xy_eta(lib, x1, y1, eta1)
v2m = mag.rhophi_theta(lib, rho2, phi2, theta2)
return lib.arccos(
dot.xy_eta_rhophi_theta(lib, x1, y1, eta1, rho2, phi2, theta2) / v1m / v2m
)


def xy_eta_rhophi_eta(lib, x1, y1, eta1, rho2, phi2, eta2):
return lib.arccos(dot.xy_eta_rhophi_eta(lib, x1, y1, eta1, rho2, phi2, eta2))
v1m = mag.xy_eta(lib, x1, y1, eta1)
v2m = mag.rhophi_eta(lib, rho2, phi2, eta2)
return lib.arccos(
dot.xy_eta_rhophi_eta(lib, x1, y1, eta1, rho2, phi2, eta2) / v1m / v2m
)


def rhophi_z_xy_z(lib, rho1, phi1, z1, x2, y2, z2):
return lib.arccos(dot.rhophi_z_xy_z(lib, rho1, phi1, z1, x2, y2, z2))
v1m = mag.rhophi_z(lib, rho1, phi1, z1)
v2m = mag.xy_z(lib, x2, y2, z2)
return lib.arccos(dot.rhophi_z_xy_z(lib, rho1, phi1, z1, x2, y2, z2) / v1m / v2m)


def rhophi_z_xy_theta(lib, rho1, phi1, z1, x2, y2, theta2):
return lib.arccos(dot.rhophi_z_xy_theta(lib, rho1, phi1, z1, x2, y2, theta2))
v1m = mag.rhophi_z(lib, rho1, phi1, z1)
v2m = mag.xy_theta(lib, x2, y2, theta2)
return lib.arccos(
dot.rhophi_z_xy_theta(lib, rho1, phi1, z1, x2, y2, theta2) / v1m / v2m
)


def rhophi_z_xy_eta(lib, rho1, phi1, z1, x2, y2, eta2):
return lib.arccos(dot.rhophi_z_xy_eta(lib, rho1, phi1, z1, x2, y2, eta2))
v1m = mag.rhophi_z(lib, rho1, phi1, z1)
v2m = mag.xy_eta(lib, x2, y2, eta2)
return lib.arccos(
dot.rhophi_z_xy_eta(lib, rho1, phi1, z1, x2, y2, eta2) / v1m / v2m
)


def rhophi_z_rhophi_z(lib, rho1, phi1, z1, rho2, phi2, z2):
return lib.arccos(dot.rhophi_z_rhophi_z(lib, rho1, phi1, z1, rho2, phi2, z2))
v1m = mag.rhophi_z(lib, rho1, phi1, z1)
v2m = mag.rhophi_z(lib, rho2, phi2, z2)
return lib.arccos(
dot.rhophi_z_rhophi_z(lib, rho1, phi1, z1, rho2, phi2, z2) / v1m / v2m
)


def rhophi_z_rhophi_theta(lib, rho1, phi1, z1, rho2, phi2, theta2):
v1m = mag.rhophi_z(lib, rho1, phi1, z1)
v2m = mag.rhophi_theta(lib, rho2, phi2, theta2)
return lib.arccos(
dot.rhophi_z_rhophi_theta(lib, rho1, phi1, z1, rho2, phi2, theta2)
dot.rhophi_z_rhophi_theta(lib, rho1, phi1, z1, rho2, phi2, theta2) / v1m / v2m
)


def rhophi_z_rhophi_eta(lib, rho1, phi1, z1, rho2, phi2, eta2):
return lib.arccos(dot.rhophi_z_rhophi_eta(lib, rho1, phi1, z1, rho2, phi2, eta2))
v1m = mag.rhophi_z(lib, rho1, phi1, z1)
v2m = mag.rhophi_eta(lib, rho2, phi2, eta2)
return lib.arccos(
dot.rhophi_z_rhophi_eta(lib, rho1, phi1, z1, rho2, phi2, eta2) / v1m / v2m
)


def rhophi_theta_xy_z(lib, rho1, phi1, theta1, x2, y2, z2):
return lib.arccos(dot.rhophi_theta_xy_z(lib, rho1, phi1, theta1, x2, y2, z2))
v1m = mag.rhophi_theta(lib, rho1, phi1, theta1)
v2m = mag.xy_z(lib, x2, y2, z2)
return lib.arccos(
dot.rhophi_theta_xy_z(lib, rho1, phi1, theta1, x2, y2, z2) / v1m / v2m
)


def rhophi_theta_xy_theta(lib, rho1, phi1, theta1, x2, y2, theta2):
v1m = mag.rhophi_theta(lib, rho1, phi1, theta1)
v2m = mag.xy_theta(lib, x2, y2, theta2)
return lib.arccos(
dot.rhophi_theta_xy_theta(lib, rho1, phi1, theta1, x2, y2, theta2)
dot.rhophi_theta_xy_theta(lib, rho1, phi1, theta1, x2, y2, theta2) / v1m / v2m
)


def rhophi_theta_xy_eta(lib, rho1, phi1, theta1, x2, y2, eta2):
return lib.arccos(dot.rhophi_theta_xy_eta(lib, rho1, phi1, theta1, x2, y2, eta2))
v1m = mag.rhophi_theta(lib, rho1, phi1, theta1)
v2m = mag.xy_eta(lib, x2, y2, eta2)
return lib.arccos(
dot.rhophi_theta_xy_eta(lib, rho1, phi1, theta1, x2, y2, eta2) / v1m / v2m
)


def rhophi_theta_rhophi_z(lib, rho1, phi1, theta1, rho2, phi2, z2):
v1m = mag.rhophi_theta(lib, rho1, phi1, theta1)
v2m = mag.rhophi_z(lib, rho2, phi2, z2)
return lib.arccos(
dot.rhophi_theta_rhophi_z(lib, rho1, phi1, theta1, rho2, phi2, z2)
dot.rhophi_theta_rhophi_z(lib, rho1, phi1, theta1, rho2, phi2, z2) / v1m / v2m
)


def rhophi_theta_rhophi_theta(lib, rho1, phi1, theta1, rho2, phi2, theta2):
v1m = mag.rhophi_theta(lib, rho1, phi1, theta1)
v2m = mag.rhophi_theta(lib, rho2, phi2, theta2)
return lib.arccos(
dot.rhophi_theta_rhophi_theta(lib, rho1, phi1, theta1, rho2, phi2, theta2)
/ v1m
/ v2m
)


def rhophi_theta_rhophi_eta(lib, rho1, phi1, theta1, rho2, phi2, eta2):
v1m = mag.rhophi_theta(lib, rho1, phi1, theta1)
v2m = mag.rhophi_eta(lib, rho2, phi2, eta2)
return lib.arccos(
dot.rhophi_theta_rhophi_eta(lib, rho1, phi1, theta1, rho2, phi2, eta2)
/ v1m
/ v2m
)


def rhophi_eta_xy_z(lib, rho1, phi1, eta1, x2, y2, z2):
return lib.arccos(dot.rhophi_eta_xy_z(lib, rho1, phi1, eta1, x2, y2, z2))
v1m = mag.rhophi_eta(lib, rho1, phi1, eta1)
v2m = mag.xy_z(lib, x2, y2, z2)
return lib.arccos(
dot.rhophi_eta_xy_z(lib, rho1, phi1, eta1, x2, y2, z2) / v1m / v2m
)


def rhophi_eta_xy_theta(lib, rho1, phi1, eta1, x2, y2, theta2):
return lib.arccos(dot.rhophi_eta_xy_theta(lib, rho1, phi1, eta1, x2, y2, theta2))
v1m = mag.rhophi_eta(lib, rho1, phi1, eta1)
v2m = mag.xy_theta(lib, x2, y2, theta2)
return lib.arccos(
dot.rhophi_eta_xy_theta(lib, rho1, phi1, eta1, x2, y2, theta2) / v1m / v2m
)


def rhophi_eta_xy_eta(lib, rho1, phi1, eta1, x2, y2, eta2):
return lib.arccos(dot.rhophi_eta_xy_eta(lib, rho1, phi1, eta1, x2, y2, eta2))
v1m = mag.rhophi_eta(lib, rho1, phi1, eta1)
v2m = mag.xy_eta(lib, x2, y2, eta2)
return lib.arccos(
dot.rhophi_eta_xy_eta(lib, rho1, phi1, eta1, x2, y2, eta2) / v1m / v2m
)


def rhophi_eta_rhophi_z(lib, rho1, phi1, eta1, rho2, phi2, z2):
return lib.arccos(dot.rhophi_eta_rhophi_z(lib, rho1, phi1, eta1, rho2, phi2, z2))
v1m = mag.rhophi_eta(lib, rho1, phi1, eta1)
v2m = mag.rhophi_z(lib, rho2, phi2, z2)
return lib.arccos(
dot.rhophi_eta_rhophi_z(lib, rho1, phi1, eta1, rho2, phi2, z2) / v1m / v2m
)


def rhophi_eta_rhophi_theta(lib, rho1, phi1, eta1, rho2, phi2, theta2):
v1m = mag.rhophi_eta(lib, rho1, phi1, eta1)
v2m = mag.rhophi_theta(lib, rho2, phi2, theta2)
return lib.arccos(
dot.rhophi_eta_rhophi_theta(lib, rho1, phi1, eta1, rho2, phi2, theta2)
/ v1m
/ v2m
)


def rhophi_eta_rhophi_eta(lib, rho1, phi1, eta1, rho2, phi2, eta2):
v1m = mag.rhophi_eta(lib, rho1, phi1, eta1)
v2m = mag.rhophi_eta(lib, rho2, phi2, eta2)
return lib.arccos(
dot.rhophi_eta_rhophi_eta(lib, rho1, phi1, eta1, rho2, phi2, eta2)
dot.rhophi_eta_rhophi_eta(lib, rho1, phi1, eta1, rho2, phi2, eta2) / v1m / v2m
)


Expand Down
Loading