Merge branch 'tickets/DM-33961'

lsst · Mar 16, 2022 · e8198aa · e8198aa
2 parents 5e54f79 + 7f35b25
commit e8198aa
Show file tree

Hide file tree

Showing 2 changed files with 222 additions and 210 deletions.
diff --git a/pipelines/coaddQAPlots.yaml b/pipelines/coaddQAPlots.yaml
@@ -99,7 +99,7 @@ tasks:
       axisActions.zAction: MagDiff
       axisActions.zAction.col1: "i_ap12Flux"
       axisActions.zAction.col2: "i_psfFlux"
-      connections.plotName: CircAp12_sub_PSF_meas_calib_psf_used_unkowns_i
+      connections.plotName: CircAp12_sub_PS_meas_calib_psf_used_unknowns_i
       selectorActions.calibPointSelector: FlagSelector
       selectorActions.calibPointSelector.selectWhenTrue: ["i_calib_psf_used"]
       selectorActions.flagSelector: CoaddPlotFlagSelector
@@ -310,32 +310,50 @@ tasks:
         from lsst.analysis.drp.calcFunctors import MagDiff
 
 
-  plot_skyObject_sky:
+  skyPlot_skyObject:
     # Make a plot showing the 9-pixel radius circular aperture flux in units of nJy.
     # This plot shows the on sky distribution of these values for sky objects.
     class: lsst.analysis.drp.skyPlot.SkyPlotTask
     config:
       axisActions.zAction.column: "i_ap09Flux"
       connections.plotName: skyObject_i
       selectorActions.flagSelector: FlagSelector
-      selectorActions.flagSelector.selectWhenTrue: ["merge_peak_sky"]
+      selectorActions.flagSelector.selectWhenTrue: ["sky_object"]
       sourceSelectorActions: None
       statisticSelectorActions.statSelector.threshold: -1e12
       axisLabels: {"x": "R.A. (Degrees)", "y": "Dec. (Degrees)", "z": "Sky Object Flux (nJy)"}
       python: |
         from lsst.analysis.drp.dataSelectors import (FlagSelector)
 
-  plot_skyObject_hist:
+  histPlot_skyObject:
     # Make a plot showing histograms of the PSFlux and 9-pixel radius circular aperture flux.
     # The left panel histograms show flux in units of nJy.
     # The right panel histograms show the equivalent sigma flux values (flux/fluxErr)
     class: lsst.analysis.drp.histPlot.HistPlotTask
     config:
       connections.plotName: skyObject
       selectorActions.flagSelector: FlagSelector
-      selectorActions.flagSelector.selectWhenTrue: ["merge_peak_sky"]
+      selectorActions.flagSelector.selectWhenTrue: ["sky_object"]
       python: |
-        from lsst.analysis.drp.dataSelectors import (FlagSelector)
+        from lsst.analysis.drp.dataSelectors import FlagSelector
+        from lsst.analysis.drp import calcFunctors
+        from lsst.pipe.tasks.dataFrameActions import SingleColumnAction
+        config.panels["panel1"] = HistPlotConfig
+        config.panels["panel1"].label = "Flux (nJy)"
+        config.panels["panel1"].actions.update = {
+          "psfFlux": SingleColumnAction(column="i_psfFlux"),
+          "ap09Flux": SingleColumnAction(column="i_ap09Flux"),
+        }
+        config.panels["panel2"] = HistPlotConfig
+        config.panels["panel2"].label = "S/N"
+        config.panels["panel2"].actions.update = {
+          "psfFlux SN": calcFunctors.SNCalculator(
+            colA=SingleColumnAction(column="i_psfFlux"),
+            colB=SingleColumnAction(column="i_psfFluxErr"),),
+          "ap09Flux SN": calcFunctors.SNCalculator(
+            colA=SingleColumnAction(column="i_ap09Flux"),
+            colB=SingleColumnAction(column="i_ap09FluxErr"),),
+        }
 
   plot_ri_gr_cmodel:
     # Make a color color plot of gri in CModel magnitudes.