Fix deprecated scipy.integrate.trapz (to trapezoid).

erykoff · Jun 17, 2024 · 1424d55 · 1424d55
1 parent 8665fae
commit 1424d55
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/redmapper/zred_color.py b/redmapper/zred_color.py
@@ -140,10 +140,10 @@ def compute_zred(self, galaxy, no_corrections=False):
         calcinds, = np.where(dist > 1e-5)
 
         if calcinds.size >= 3:
-            tdist = scipy.integrate.trapz(dist[calcinds], self.zredstr.z[calcinds])
-            zred_temp = scipy.integrate.trapz(dist[calcinds] * self.zredstr.z[calcinds],
+            tdist = scipy.integrate.trapezoid(dist[calcinds], self.zredstr.z[calcinds])
+            zred_temp = scipy.integrate.trapezoid(dist[calcinds] * self.zredstr.z[calcinds],
                                               self.zredstr.z[calcinds]) / tdist
-            zred_e = scipy.integrate.trapz(dist[calcinds] * self.zredstr.z[calcinds]**2.,
+            zred_e = scipy.integrate.trapezoid(dist[calcinds] * self.zredstr.z[calcinds]**2.,
                                            self.zredstr.z[calcinds]) / tdist - zred_temp**2.
         else:
             tdist = np.sum(dist[calcinds])
@@ -203,7 +203,7 @@ def compute_zred(self, galaxy, no_corrections=False):
         if calcinds.size >= 3:
             # Note there maybe should be a distcorr here, but this is not
             #  actually computed in the IDL code (bug?)
-            lkhd = scipy.integrate.trapz(newdist[calcinds] * (lndist[calcinds]), self.zredstr.z[calcinds]) / scipy.integrate.trapz(newdist[calcinds], self.zredstr.z[calcinds])
+            lkhd = scipy.integrate.trapezoid(newdist[calcinds] * (lndist[calcinds]), self.zredstr.z[calcinds]) / scipy.integrate.trapezoid(newdist[calcinds], self.zredstr.z[calcinds])
         else:
             lkhd = np.sum(newdist[calcinds] * lndist[calcinds]) / np.sum(newdist[calcinds])