Merge branch 'tickets/DM-44545'

lsst · Oct 17, 2024 · ebf2b1a · ebf2b1a
2 parents 8fa675b + e23fa6a
commit ebf2b1a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/pipelines/cpCore.yaml b/pipelines/cpCore.yaml
@@ -161,6 +161,7 @@ tasks:
     class: lsst.analysis.tools.tasks.VerifyCalibAnalysisTask
     config:
       connections.outputName: cpPtcCore
+      connections.data: verifyPtcResults
 
       atools.ptcGainPerAmp: CalibStatisticFocalPlanePlot
       atools.ptcGainPerAmp.produce.plot.addHistogram: true
@@ -209,10 +210,21 @@ tasks:
 
       atools.ptcPlot: CalibAmpScatterTool
       atools.ptcPlot.prep.panelKey: amplifier
-      atools.ptcPlot.prep.dataKey: PTC_PTC_RAW_MEANS
-      atools.ptcPlot.prep.quantityKey: PTC_PTC_RAW_VARIANCE
+      atools.ptcPlot.prep.dataKey: PTC_PTC_FINAL_MEANS
+      atools.ptcPlot.prep.quantityKey: PTC_PTC_FINAL_VARIANCE
       atools.ptcPlot.produce.plot.xAxisLabel: "Exposure Pair Flux (ADU)"
       atools.ptcPlot.produce.plot.yAxisLabel: "Exposure Pair Variance (ADU^2)"
+      atools.ptcPlot.produce.plot.suptitle:
+        t: "PTC (Final)"
+
+      atools.rawPtcPlot: CalibAmpScatterTool
+      atools.rawPtcPlot.prep.panelKey: amplifier
+      atools.rawPtcPlot.prep.dataKey: PTC_PTC_RAW_MEANS
+      atools.rawPtcPlot.prep.quantityKey: PTC_PTC_RAW_VARIANCE
+      atools.rawPtcPlot.produce.plot.xAxisLabel: "Exposure Pair Flux (ADU)"
+      atools.rawPtcPlot.produce.plot.yAxisLabel: "Exposure Pair Variance (ADU^2)"
+      atools.rawPtcPlot.produce.plot.suptitle:
+        t: "PTC (Raw)"
       python: |
         from lsst.analysis.tools.atools import *
 

diff --git a/python/lsst/analysis/tools/actions/plot/elements/scatterElement.py b/python/lsst/analysis/tools/actions/plot/elements/scatterElement.py
@@ -104,7 +104,7 @@ def __call__(self, data: KeyedData, ax: Axes, **kwargs) -> KeyedData:
             data[self.xKey] if self.xKey is not None else range(len(data[self.valsKey])),  # type: ignore
             data[self.valsKey],  # type: ignore
             color=self.color if self.color is not None else None,
-            marker=self.marker if self.marker is not None else None,
+            marker=self.marker if self.marker is not None else ".",
             linestyle=self.linestyle if self.linestyle is not None else None,
             linewidth=self.linewidth if self.linewidth is not None else None,
             markersize=self.markersize if self.markersize is not None else None,