Pass isrStatistics to output dictionary.

lsst · Jan 12, 2024 · 7882c60 · 7882c60
1 parent 3cbd9af
commit 7882c60
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/pipelines/_ingredients/VerifyDark.yaml b/pipelines/_ingredients/VerifyDark.yaml
@@ -11,12 +11,15 @@ tasks:
       doFlat: false
       doApplyGains: false
       doFringe: false
+      doCalculateStatistics: true
+      isrStats.doCalibDistributionStatistics: true
   verifyDarkChip:
     class: lsst.cp.verify.CpVerifyDarkTask
     config:
       connections.inputExp: 'verifyDarkProc'
       connections.taskMetadata: 'verifyDarkApply_metadata'
       connections.outputStats: 'verifyDarkDetStats'
+      useIsrStatistics: true
   verifyDarkExp:
     class: lsst.cp.verify.CpVerifyExpMergeTask
     config:

diff --git a/python/lsst/cp/verify/verifyStats.py b/python/lsst/cp/verify/verifyStats.py
@@ -78,6 +78,13 @@ class CpVerifyStatsConnections(
         dimensions=["instrument", ],
         isCalibration=True,
     )
+    isrStatistics = cT.Input(
+        name="isrStatistics",
+        storageClass="StructuredDataDict",
+        doc="Pre-calculated statistics from IsrTask.",
+        dimensions=["instrument", "exposure", "detector"],
+    )
+
     outputStats = cT.Output(
         name="detectorStats",
         doc="Output statistics from cp_verify.",
@@ -98,6 +105,9 @@ def __init__(self, *, config=None):
         if len(config.uncorrectedImageStatKeywords) < 1:
             self.inputs.discard("uncorrectedExp")
 
+        if config.useIsrStatistics is not True:
+            self.inputs.discard("isrStatistics")
+
 
 class CpVerifyStatsConfig(
     pipeBase.PipelineTaskConfig, pipelineConnections=CpVerifyStatsConnections
@@ -212,6 +222,11 @@ class CpVerifyStatsConfig(
         doc="Statistics to create for the full detector from the per-amplifier measurements.",
         default={},
     )
+    useIsrStatistics = pexConfig.Field(
+        dtype=bool,
+        doc="Use statistics calculated by IsrTask?",
+        default=False,
+    )
 
 
 class CpVerifyStatsTask(pipeBase.PipelineTask):
@@ -233,6 +248,7 @@ def run(
         self,
         inputExp,
         camera,
+        isrStatistics=None,
         uncorrectedExp=None,
         taskMetadata=None,
         inputCatalog=None,
@@ -330,6 +346,9 @@ def run(
         else:
             outputStats["DET"] = {}
 
+        if self.config.useIsrStatistics:
+            outputStats["EXTRA"] = isrStatistics
+
         outputStats["VERIFY"], outputStats["SUCCESS"] = self.verify(
             inputExp, outputStats
         )