changing to ripplegw

tedwards2412 · May 23, 2024 · a92a000 · a92a000
1 parent f20c0cb
commit a92a000
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 34 deletions.
diff --git a/src/ripplegw/waveforms/IMRPhenomD.py b/src/ripplegw/waveforms/IMRPhenomD.py
@@ -15,7 +15,7 @@
 from .IMRPhenomD_QNMdata import fM_CUT
 from ..constants import EulerGamma, gt, m_per_Mpc, C, PI
 from ..typing import Array
-from ripple import Mc_eta_to_ms
+from ripplegw import Mc_eta_to_ms
 
 
 def get_inspiral_phase(fM_s: Array, theta: Array, coeffs: Array) -> Array:

diff --git a/src/ripplegw/waveforms/IMRPhenomD_NRTidalv2.py b/src/ripplegw/waveforms/IMRPhenomD_NRTidalv2.py
@@ -6,9 +6,9 @@
 import jax.numpy as jnp
 from ..constants import gt, m_per_Mpc, PI, TWO_PI, MRSUN
 from ..typing import Array
-from ripple import Mc_eta_to_ms, lambda_tildes_to_lambdas
+from ripplegw import Mc_eta_to_ms, lambda_tildes_to_lambdas
 from .IMRPhenom_tidal_utils import get_quadparam_octparam, get_kappa
-from ripple.waveforms.IMRPhenomD import Phase, Amp, get_IIb_raw_phase
+from ripplegw.waveforms.IMRPhenomD import Phase, Amp, get_IIb_raw_phase
 from .IMRPhenomD_utils import (
     get_coeffs,
     get_transition_frequencies,

diff --git a/src/ripplegw/waveforms/IMRPhenomPv2.py b/src/ripplegw/waveforms/IMRPhenomPv2.py
@@ -1,6 +1,6 @@
 import jax
 import jax.numpy as jnp
-from ripple import Mc_eta_to_ms
+from ripplegw import Mc_eta_to_ms
 
 from ..constants import gt, MSUN
 import numpy as np
@@ -128,10 +128,6 @@ def PhenomPOneFrequency(
     # the wrong array it will behave strangely
     norm = 2.0 * jnp.sqrt(5.0 / (64.0 * jnp.pi))
     theta_ripple = jnp.array([m1, m2, chi1, chi2])
-    # coeffs = get_coeffs(theta_ripple)
-    # transition_freqs = phP_get_transition_frequencies(
-    #     theta_ripple, coeffs[5], coeffs[6], chip
-    # )
 
     phase = PhDPhase(fs, theta_ripple, coeffs, transition_freqs)
     Dphi = lambda f: -PhDPhase(f, theta_ripple, coeffs, transition_freqs)
@@ -144,28 +140,6 @@ def PhenomPOneFrequency(
     return hPhenom, Dphi
 
 
-# def PhenomPOneFrequency_phase(
-#     f: float,
-#     m1: float,
-#     m2: float,
-#     chi1: float,
-#     chi2: float,
-#     chip: float,
-#     phic: float,
-#     M: float,
-#     dist_mpc: float,
-# ):
-#     """ """
-#     theta_ripple = jnp.array([m1, m2, chi1, chi2])
-#     coeffs = get_coeffs(theta_ripple)
-#     transition_freqs = phP_get_transition_frequencies(
-#         theta_ripple, coeffs[5], coeffs[6], chip
-#     )
-
-#     phase = PhDPhase(f, theta_ripple, coeffs, transition_freqs)
-#     return -phase
-
-
 def gen_IMRPhenomPv2(
     fs: Array,
     theta: Array,

diff --git a/src/ripplegw/waveforms/IMRPhenomPv2_utils.py b/src/ripplegw/waveforms/IMRPhenomPv2_utils.py
@@ -1,6 +1,6 @@
 import jax
 import jax.numpy as jnp
-from ripple import Mc_eta_to_ms
+from ripplegw import Mc_eta_to_ms
 
 from typing import Tuple
 from ..constants import gt, MSUN

diff --git a/src/ripplegw/waveforms/IMRPhenomXAS.py b/src/ripplegw/waveforms/IMRPhenomXAS.py
@@ -2,10 +2,10 @@
 import jax
 import jax.numpy as jnp
 from ..constants import EulerGamma, gt, m_per_Mpc, C, PI
-from ripple.waveforms import IMRPhenomX_utils
+from ripplegw.waveforms import IMRPhenomX_utils
 from ..typing import Array
 
-from ripple import Mc_eta_to_ms
+from ripplegw import Mc_eta_to_ms
 
 eqspin_indx = 10
 uneqspin_indx = 39

diff --git a/src/ripplegw/waveforms/TaylorF2.py b/src/ripplegw/waveforms/TaylorF2.py
@@ -5,7 +5,7 @@
 import jax.numpy as jnp
 from ..constants import EulerGamma, gt, m_per_Mpc, PI, MRSUN
 from ..typing import Array
-from ripple import Mc_eta_to_ms, lambda_tildes_to_lambdas
+from ripplegw import Mc_eta_to_ms, lambda_tildes_to_lambdas
 from .IMRPhenom_tidal_utils import get_quadparam_octparam
 
 ###########################