Fix filters/selectors in astromDiff plots

lsst · Jul 29, 2022 · d357a6f · d357a6f
1 parent 1fdabb8
commit d357a6f
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/python/lsst/analysis/tools/analysisPlots/analysisPlots.py b/python/lsst/analysis/tools/analysisPlots/analysisPlots.py
@@ -198,28 +198,44 @@ def coaddContext(self) -> None:
         self.prep = CoaddPrep()
         self.process.buildActions.starSelector.vectorKey = "{band}_extendedness"
         self.process.buildActions.mags = MagColumnNanoJansky(vectorKey="{band}_psfFlux")
+        self.process.filterActions.psfFlux = DownselectVector(
+            vectorKey="{band}_psfFlux", selector=VectorSelector(vectorKey="starSelector")
+        )
+        self.process.filterActions.psfFluxErr = DownselectVector(
+            vectorKey="{band}_psfFluxErr", selector=VectorSelector(vectorKey="starSelector")
+        )
 
     def visitContext(self) -> None:
         self.prep = VisitPrep()
         self.process.buildActions.starSelector.vectorKey = "extendedness"
         self.process.buildActions.mags = MagColumnNanoJansky(vectorKey="psfFlux")
-        self.process.calculateActions.stars.fluxType = "psfFlux"
-        self.process.calculateActions.stars.lowSNSelector.fluxType = "psfFlux"
-        self.process.calculateActions.stars.highSNSelector.fluxType = "psfFlux"
+        self.process.filterActions.psfFlux = DownselectVector(
+            vectorKey="psfFlux", selector=VectorSelector(vectorKey="starSelector")
+        )
+        self.process.filterActions.psfFluxErr = DownselectVector(
+            vectorKey="psfFluxErr", selector=VectorSelector(vectorKey="starSelector")
+        )
 
     def setDefaults(self, coordinate):
         super().setDefaults()
 
         self.process.buildActions.starSelector = StarSelector()
+        coordStr = coordinate.lower()
+        self.process.buildActions.astromDiff = AstromDiff(
+            col1=f"coord_{coordStr}_target", col2=f"coord_{coordStr}_ref"
+        )
 
         self.process.filterActions.xStars = DownselectVector(
             vectorKey="mags", selector=VectorSelector(vectorKey="starSelector")
         )
-        coordStr = coordinate.lower()
-        self.process.buildActions.yStars = AstromDiff(
-            col1=f"coord_{coordStr}_target", col2=f"coord_{coordStr}_ref"
+        self.process.filterActions.yStars = DownselectVector(
+            vectorKey="astromDiff", selector=VectorSelector(vectorKey="starSelector")
         )
+
         self.process.calculateActions.stars = ScatterPlotStatsAction(vectorKey="yStars")
+        self.process.calculateActions.stars.lowSNSelector.fluxType = "psfFlux"
+        self.process.calculateActions.stars.highSNSelector.fluxType = "psfFlux"
+        self.process.calculateActions.stars.fluxType = "psfFlux"
 
         self.produce = ScatterPlotWithTwoHists()