From 145b41a8050a6821f9b06d6431f12263663cf837 Mon Sep 17 00:00:00 2001 From: "Peter T. H. Pang" Date: Tue, 20 Feb 2024 12:13:58 +0100 Subject: [PATCH] Fixing conflict --- src/jimgw/single_event/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jimgw/single_event/utils.py b/src/jimgw/single_event/utils.py index 480f98f3..df9df401 100644 --- a/src/jimgw/single_event/utils.py +++ b/src/jimgw/single_event/utils.py @@ -1,5 +1,6 @@ import jax.numpy as jnp from jax.scipy.special import i0e, logsumexp +from jax.scipy.integrate import trapezoid from jax import jit from jaxtyping import Float, Array @@ -35,7 +36,7 @@ def inner_product( # psd_interp = jnp.interp(frequency, psd_frequency, psd) df = frequency[1] - frequency[0] integrand = jnp.conj(h1) * h2 / psd - return 4.0 * jnp.real(jnp.trapz(integrand, dx=df)) + return 4.0 * jnp.real(trapezoid(integrand, dx=df)) @jit