Works around failures in scatterPlot

This patch works around some failures in scatterPlot.py until a the underlying issues can be resolved.
lsst · Apr 4, 2022 · 78d987f · 78d987f
1 parent b66497a
commit 78d987f
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/python/lsst/analysis/drp/scatterPlot.py b/python/lsst/analysis/drp/scatterPlot.py
@@ -250,7 +250,11 @@ def run(self, catPlot, dataId, runName, skymap, tableName, bands, plotName):
         sumStats = {} if skymap is None else generateSummaryStats(
             plotDf, self.config.axisLabels["y"], skymap, plotInfo)
         # Make the plot
-        fig = self.scatterPlotWithTwoHists(plotDf, plotInfo, sumStats)
+        try:
+            fig = self.scatterPlotWithTwoHists(plotDf, plotInfo, sumStats)
+        except Exception:
+            # This is a workaround until scatterPlotWithTwoHists works properly
+            fig = plt.figure(dpi=300)
 
         return pipeBase.Struct(scatterPlot=fig)
 
@@ -385,12 +389,14 @@ def scatterPlotWithTwoHists(self, catPlot, plotInfo, sumStats, yLims=False, xLim
                            sourceTypeMapper["galaxies"]),
                           (xsStars.values, ysStars.values, "midnightblue", newBlues,
                            sourceTypeMapper["stars"])]
-        if np.any(catPlot["sourceType"] == sourceTypeMapper["unknowns"]):
+        elif np.any(catPlot["sourceType"] == sourceTypeMapper["unknowns"]):
             unknowns = (catPlot["sourceType"] == sourceTypeMapper["unknowns"])
             toPlotList = [(catPlot.loc[unknowns, xCol].values, catPlot.loc[unknowns, yCol].values,
-                           "green", sourceTypeMapper["unknowns"])]
-        if np.any(catPlot["sourceType"] == sourceTypeMapper["all"]):
-            toPlotList = [(catPlot[xCol].values, catPlot[yCol].values, "purple", sourceTypeMapper["all"])]
+                           "green", None, sourceTypeMapper["unknowns"])]
+        elif np.any(catPlot["sourceType"] == sourceTypeMapper["all"]):
+            toPlotList = [(catPlot[xCol].values, catPlot[yCol].values, "purple", None, sourceTypeMapper["all"])]
+        else:
+            toPlotList = []
 
         for (j, (xs, ys, color, cmap, sourceType)) in enumerate(toPlotList):
             if len(xs) < 2: