Skip to content

Add aligned-spin conditions to PhenomPv2 angle calculations #36

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
SSL32081 wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −2
Open

Add aligned-spin conditions to PhenomPv2 angle calculations #36

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb7f569
Add aligned-spin conditions to PhenomPv2 angle calculations
SSL32081 Apr 14, 2025
d3ed2c0
Fix jax.where to jnp.where
SSL32081 Apr 15, 2025
9c2f221
Switch to use `&` instead of `and`
SSL32081 Apr 15, 2025
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
16 changes: 14 additions & 2 deletions src/ripplegw/waveforms/IMRPhenomPv2_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
from ..typing import Array
from .IMRPhenomD_QNMdata import QNMData_a, QNMData_fRD, QNMData_fdamp

MAX_TOL_ATAN = 1.0e-15


# helper functions for LALtoPhenomP:
def ROTATEZ(angle, x, y, z):
Expand Down Expand Up @@ -92,7 +94,12 @@ def convert_spins(

thetaJ_sf = jnp.arccos(J0z_sf / J0)

phiJ_sf = jnp.arctan2(J0y_sf, J0x_sf)
no_inplane_J0 = (jnp.abs(J0x_sf) < MAX_TOL_ATAN) & (jnp.abs(J0y_sf) < MAX_TOL_ATAN)
phiJ_sf = jnp.where(
no_inplane_J0,
jnp.pi / 2.0 - phiRef, # This is the aligned-spin case
jnp.arctan2(J0y_sf, J0x_sf),
)

phi_aligned = -phiJ_sf

Expand All @@ -117,7 +124,12 @@ def convert_spins(
tmp_x, tmp_y, tmp_z = ROTATEY(-thetaJ_sf, tmp_x, tmp_y, tmp_z)
tmp_x, tmp_y, tmp_z = ROTATEZ(kappa, tmp_x, tmp_y, tmp_z)

alpha0 = jnp.arctan2(tmp_y, tmp_x)
no_inplane_LN = (jnp.abs(tmp_x) < MAX_TOL_ATAN) & (jnp.abs(tmp_y) < MAX_TOL_ATAN)
alpha0 = jnp.where(
no_inplane_LN,
jnp.pi, # This is the aligned-spin case
jnp.arctan2(tmp_y, tmp_x),
)

# Finally we determine thetaJ, by rotating N
tmp_x, tmp_y, tmp_z = Nx_sf, Ny_sf, Nz_sf
Expand Down