Merge branch 'master' into darkemu_hmfunc

LSSTDESC · Jul 12, 2024 · dbbbdd5 · dbbbdd5
2 parents b9a8dbe + 132cfc1
commit dbbbdd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/environment.yml b/.github/environment.yml
@@ -20,7 +20,7 @@ dependencies:
   - george  # for dark_emu
   - pip:
       #- classy<3
-      - isitgr
+      - isitgr<=1.0.2
       - velocileptors @ git+https://github.com/sfschen/velocileptors
       - baccoemu @ git+https://bitbucket.org/rangulo/baccoemu.git@master
       - MiraTitanHMFemulator

diff --git a/pyccl/halos/profiles/ia.py b/pyccl/halos/profiles/ia.py
@@ -418,7 +418,7 @@ def _usat_fourier(self, cosmo, k, M, a):
                     from scipy.integrate import simpson
                     for i, M_i in enumerate(M_use):
                         prof[i, :] += (simpson(integrand[:, i, :],
-                                               r_use[i, :]).T
+                                               x=r_use[i, :]).T
                                        * (1j**l).real * (2*l+1)
                                        * self._angular_fl[j])
                 elif self.integration_method == 'spline':