Merge pull request #52 from lsst/tickets/DM-36933

DM-36933: Replace deprecated median_absolute_deviation with median_abs_deviation.
lsst · Nov 9, 2022 · 2fa89e6 · 2fa89e6
2 parents 6c7c48a + 3f97db9
commit 2fa89e6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/python/lsst/analysis/drp/colorColorFitPlot.py b/python/lsst/analysis/drp/colorColorFitPlot.py
@@ -1,7 +1,7 @@
 import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
-from scipy.stats import median_absolute_deviation as sigmaMad
+from scipy.stats import median_abs_deviation as sigmaMad
 import pandas as pd
 from sklearn.neighbors import KernelDensity
 from matplotlib.patches import Rectangle
@@ -351,7 +351,7 @@ def colorColorFitPlot(self, catPlot, plotInfo, fitParams):
         axHist.set_ylabel("Number")
         axHist.set_xlabel("Distance to Line Fit")
         medDists = np.median(dists)
-        madDists = sigmaMad(dists)
+        madDists = sigmaMad(dists, scale="normal")
         meanDists = np.mean(dists)
 
         rmsDists = np.sqrt(np.mean(np.array(dists)**2))

diff --git a/python/lsst/analysis/drp/histPlot.py b/python/lsst/analysis/drp/histPlot.py
@@ -2,7 +2,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
-from scipy.stats import median_absolute_deviation as sigmaMad
+from scipy.stats import median_abs_deviation as sigmaMad
 from matplotlib import gridspec
 from matplotlib.patches import Rectangle
 from matplotlib.collections import PatchCollection
@@ -334,7 +334,7 @@ def histPlot(self, catPlot, plotInfo, sumStats):
                 # generate additional per-histogram statistics
                 isfinite = np.isfinite(hist_data)
                 meds.append(np.median(hist_data[isfinite]))
-                mads.append(sigmaMad(hist_data[isfinite]))
+                mads.append(sigmaMad(hist_data[isfinite], scale="normal"))
                 nums.append(np.sum(isfinite))
             vLower = np.min(vLowers)
             vUpper = np.max(vUppers)

diff --git a/python/lsst/analysis/drp/quiverPlot.py b/python/lsst/analysis/drp/quiverPlot.py
@@ -1,6 +1,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
-from scipy.stats import median_absolute_deviation as sigmaMad
+from scipy.stats import median_abs_deviation as sigmaMad
 from matplotlib.patches import Rectangle
 import matplotlib.patheffects as pathEffects
 from lsst.pex.config import Field
@@ -110,7 +110,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
         if np.any(catPlot["sourceType"] == 2):
             statGals = ((catPlot["useForStats"] == 1) & galaxies)
             statGalMed = np.nanmedian(catPlot.loc[statGals, zCol])
-            statGalMad = sigmaMad(catPlot.loc[statGals, zCol], nan_policy="omit")
+            statGalMad = sigmaMad(catPlot.loc[statGals, zCol], nan_policy="omit", scale="normal")
 
             galStatsText = ("Median: {:.2f}\n".format(statGalMed) + r"$\sigma_{MAD}$: "
                             + "{:.2f}\n".format(statGalMad) + r"n$_{points}$: "
@@ -130,7 +130,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
 
             statStars = ((catPlot["useForStats"] == 1) & stars)
             statStarMed = np.nanmedian(catPlot.loc[statStars, zCol])
-            statStarMad = sigmaMad(catPlot.loc[statStars, zCol], nan_policy="omit")
+            statStarMad = sigmaMad(catPlot.loc[statStars, zCol], nan_policy="omit", scale="normal")
 
             starStatsText = ("Median: {:.2f}\n".format(statStarMed) + r"$\sigma_{MAD}$: "
                              + "{:.2f}\n".format(statStarMad) + r"n$_{points}$: "
@@ -143,7 +143,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
 
             statAll = (catPlot["useForStats"] == 1)
             statAllMed = np.nanmedian(catPlot.loc[statAll, zCol])
-            statAllMad = sigmaMad(catPlot.loc[statAll, zCol], nan_policy="omit")
+            statAllMad = sigmaMad(catPlot.loc[statAll, zCol], nan_policy="omit", scale="normal")
 
             allStatsText = ("Median: {:.2f}\n".format(statAllMed) + r"$\sigma_{MAD}$: "
                             + "{:.2f}\n".format(statAllMad) + r"n$_{points}$: "
@@ -155,7 +155,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
 
             statAll = (catPlot["useForStats"] == 1)
             statAllMed = np.nanmedian(catPlot.loc[statAll, zCol])
-            statAllMad = sigmaMad(catPlot.loc[statAll, zCol], nan_policy="omit")
+            statAllMad = sigmaMad(catPlot.loc[statAll, zCol], nan_policy="omit", scale="normal")
 
             allStatsText = ("Median: {:.2f}\n".format(statAllMed) + r"$\sigma_{MAD}$: "
                             + "{:.2f}\n".format(statAllMad) + r"n$_{points}$: "

diff --git a/python/lsst/analysis/drp/skyPlot.py b/python/lsst/analysis/drp/skyPlot.py
@@ -1,7 +1,7 @@
 import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
-from scipy.stats import median_absolute_deviation as sigmaMad
+from scipy.stats import median_abs_deviation as sigmaMad
 from scipy.stats import binned_statistic_2d
 from matplotlib.patches import Rectangle
 import matplotlib.patheffects as pathEffects
@@ -339,7 +339,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
             statStars = ((catPlot["useForStats"] == 1) & stars)
             if sum(statStars) > 0:
                 statStarMed = np.nanmedian(catPlot.loc[statStars, zCol])
-                statStarMad = sigmaMad(catPlot.loc[statStars, zCol], nan_policy="omit")
+                statStarMad = sigmaMad(catPlot.loc[statStars, zCol], nan_policy="omit", scale="normal")
                 snTextStr = snText
             else:  # No data to plot
                 statStarMed = np.nan
@@ -361,7 +361,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
             statGals = ((catPlot["useForStats"] == 1) & galaxies)
             if sum(statGals) > 0:
                 statGalMed = np.nanmedian(catPlot.loc[statGals, zCol])
-                statGalMad = sigmaMad(catPlot.loc[statGals, zCol], nan_policy="omit")
+                statGalMad = sigmaMad(catPlot.loc[statGals, zCol], nan_policy="omit", scale="normal")
                 snTextStr = snText
             else:  # No data to plot
                 statGalMed = np.nan
@@ -384,7 +384,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
             statAll = (catPlot["useForStats"] == 1)
             if sum(statAll) > 0:
                 statAllMed = np.nanmedian(catPlot.loc[statAll, zCol])
-                statAllMad = sigmaMad(catPlot.loc[statAll, zCol], nan_policy="omit")
+                statAllMad = sigmaMad(catPlot.loc[statAll, zCol], nan_policy="omit", scale="normal")
                 snTextStr = snText
             else:  # No data to plot
                 statAllMed = np.nan
@@ -402,7 +402,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
             statUnk = ((catPlot["useForStats"] == 1) & unknowns)
             if sum(statUnk) > 0:
                 statUnkMed = np.nanmedian(catPlot.loc[statUnk, zCol])
-                statUnkMad = sigmaMad(catPlot.loc[statUnk, zCol], nan_policy="omit")
+                statUnkMad = sigmaMad(catPlot.loc[statUnk, zCol], nan_policy="omit", scale="normal")
                 snTextStr = snText
             else:  # No data to plot
                 statUnkMed = np.nan
@@ -476,7 +476,7 @@ def skyPlot(self, catPlot, plotInfo, sumStats):
                 if minDec == maxDec:
                     maxDec += 1e-5  # There is no reason to pick this number in particular
             med = np.median(colorVals)
-            mad = sigmaMad(colorVals)
+            mad = sigmaMad(colorVals, scale="normal")
             vmin = med - 2*mad
             vmax = med + 2*mad
             if self.config.fixAroundZero: