Merge branch 'tickets/DM-30171'

pipelines/VerifyDefect.yaml

@@ -6,29 +6,29 @@ tasks:
       connections.ccdExposure: 'raw'
       connections.outputExposure: 'verifyDefectProc'
       overscan.fitType: 'MEDIAN_PER_ROW'
-      doWrite: True
-      doOverscan: True
-      doAssembleCcd: True
-      doBias: True
-      doVariance: False
-      doLinearize: False
-      doCrosstalk: False
-      doBrighterFatter: False
-      doDark: False
-      doStrayLight: False
-      doFlat: False
-      doFringe: False
-      doApplyGains: False
-      doDefect: True
-      doSaturationInterpolation: False
+      doWrite: true
+      doOverscan: true
+      doAssembleCcd: true
+      doBias: true
+      doVariance: false
+      doLinearize: false
+      doCrosstalk: false
+      doBrighterFatter: false
+      doDark: false
+      doStrayLight: false
+      doFlat: false
+      doFringe: false
+      doApplyGains: false
+      doDefect: true
+      doSaturationInterpolation: false
       growSaturationFootprintSize: 0
   verifyMeasureStats:
     class: lsst.cp.verify.CpVerifyDefectsTask
     config:
       connections.inputExp: 'verifyDefectProc'
       connections.outputStats: 'verifyDefectDetStats'
-      doVignette: False
-      useReadNoise: False
+      doVignette: false
+      useReadNoise: false
   verifyExposureStats:
     class: lsst.cp.verify.CpVerifyExpMergeTask
     config:

pipelines/VerifyPtc.yaml

@@ -0,0 +1,12 @@
+description: cp_verify Photon Transfer Curve calibration verification
+tasks:
+  verifyPtcCalib:
+    class: lsst.cp.verify.verifyPtc.CpVerifyPtcTask
+    config:
+      connections.inputCalib: 'ptc'
+      connections.outputStats: 'verifyPtcDetStats'
+  verifyPtc:
+    class: lsst.cp.verify.CpVerifyCalibMergeTask
+    config:
+      connections.inputStats: 'verifyPtcDetStats'
+      connections.outputStats: 'verifyPtcStats'

python/lsst/cp/verify/__init__.py

@@ -29,3 +29,4 @@
 from .verifyDark import *
 from .verifyFlat import *
 from .verifyCrosstalk import *
+from .verifyPtc import *

python/lsst/cp/verify/verifyCalib.py

@@ -22,6 +22,7 @@
 import lsst.pipe.base as pipeBase
 import lsst.pipe.base.connectionTypes as cT
 
+from lsst.cp.pipe._lookupStaticCalibration import lookupStaticCalibration
 
 __all__ = ['CpVerifyCalibConfig', 'CpVerifyCalibTask']
 
@@ -37,6 +38,15 @@ class CpVerifyCalibConnections(pipeBase.PipelineTaskConnections,
         isCalibration=True
     )
 
+    camera = cT.PrerequisiteInput(
+        name="camera",
+        doc="Input camera to use for gain lookup.",
+        storageClass="Camera",
+        dimensions=("instrument",),
+        lookupFunction=lookupStaticCalibration,
+        isCalibration=True,
+    )
+
     outputStats = cT.Output(
         name="calibStats",
         doc="Output statistics from cp_verify.",
@@ -86,14 +96,16 @@ class CpVerifyCalibTask(pipeBase.PipelineTask):
     ConfigClass = CpVerifyCalibConfig
     _DefaultName = 'cpVerifyCalib'
 
-    def run(self, inputCalib):
+    def run(self, inputCalib, camera=None):
         """Calculate quality statistics and verify they meet the requirements
         for a calibration.
 
         Parameters
         ----------
         inputCalib : `lsst.ip.isr.IsrCalib`
             The calibration to be measured.
+        camera : `lsst.afw.cameraGeom.Camera`, optional
+            Input camera.
 
         Returns
         -------
@@ -111,22 +123,25 @@ def run(self, inputCalib):
         DET:
           STAT: value
           STAT2: value
+        AMP:
+          STAT: value
+          STAT2: value
         VERIFY:
           TEST: boolean
         SUCCESS: boolean
 
         """
         outputStats = {}
-
-        outputStats['DET'] = self.detectorStatistics(inputCalib)
-        outputStats['VERIFY'], outputStats['SUCCESS'] = self.verify(inputCalib, outputStats)
+        outputStats['AMP'] = self.amplifierStatistics(inputCalib, camera=camera)
+        outputStats['DET'] = self.detectorStatistics(inputCalib, camera=camera)
+        outputStats['VERIFY'], outputStats['SUCCESS'] = self.verify(inputCalib, outputStats, camera=camera)
 
         return pipeBase.Struct(
             outputStats=outputStats,
         )
 
     # Methods that need to be implemented by the calibration-level subclasses.
-    def detectorStatistics(self, inputCalib):
+    def detectorStatistics(self, inputCalib, camera=None):
         """Calculate detector level statistics from the calibration.
 
         Parameters
@@ -138,6 +153,8 @@ def detectorStatistics(self, inputCalib):
         -------
         outputStatistics : `dict` [`str`, scalar]
             A dictionary of the statistics measured and their values.
+        camera : `lsst.afw.cameraGeom.Camera`, optional
+            Input camera.
 
         Raises
         ------
@@ -147,7 +164,30 @@ def detectorStatistics(self, inputCalib):
         """
         raise NotImplementedError("Subclasses must implement detector statistics method.")
 
-    def verify(self, inputCalib, statisticsDict):
+    def amplifierStatistics(self, inputCalib, camera=None):
+        """Calculate amplifier level statistics from the calibration.
+
+        Parameters
+        ----------
+        inputCalib : `lsst.ip.isr.IsrCalib`
+            The calibration to verify.
+        camera : `lsst.afw.cameraGeom.Camera`, optional
+            Input camera.
+
+        Returns
+        -------
+        outputStatistics : `dict` [`str`, scalar]
+            A dictionary of the statistics measured and their values.
+
+        Raises
+        ------
+        NotImplementedError :
+            This method must be implemented by the calibration-type
+            subclass.
+        """
+        raise NotImplementedError("Subclasses must implement amplifier statistics method.")
+
+    def verify(self, inputCalib, statisticsDict, camera=None):
         """Verify that the measured calibration meet the verification criteria.
 
         Parameters
@@ -159,6 +199,8 @@ def verify(self, inputCalib, statisticsDict):
             should have keys that are statistic names (`str`) with
             values that are some sort of scalar (`int` or `float` are
             the mostly likely types).
+        camera : `lsst.afw.cameraGeom.Camera`, optional
+            Input camera.
 
         Returns
         -------

python/lsst/cp/verify/verifyCrosstalk.py

@@ -54,13 +54,15 @@ class CpVerifyCrosstalkTask(CpVerifyCalibTask):
     ConfigClass = CpVerifyCrosstalkConfig
     _DefaultName = 'cpVerifyCrosstalk'
 
-    def detectorStatistics(self, inputCalib):
+    def detectorStatistics(self, inputCalib, camera=None):
         """Calculate detector level statistics from the calibration.
 
         Parameters
         ----------
         inputCalib : `lsst.ip.isr.IsrCalib`
             The calibration to verify.
+        camera : `lsst.afw.cameraGeom.Camera`, optional
+            Input camera.
 
         Returns
         -------
@@ -73,7 +75,25 @@ def detectorStatistics(self, inputCalib):
 
         return outputStatistics
 
-    def verify(self, calib, statisticsDict):
+    def amplifierStatistics(self, inputCalib, camera=None):
+        """Calculate amplifier level statistics from the calibration.
+
+        Parameters
+        ----------
+        inputCalib : `lsst.ip.isr.IsrCalib`
+            The calibration to verify.
+        camera : `lsst.afw.cameraGeom.Camera`, optional
+            Input camera.
+
+        Returns
+        -------
+        outputStatistics : `dict` [`str`, scalar]
+            A dictionary of the statistics measured and their values.
+        """
+
+        pass
+
+    def verify(self, calib, statisticsDict, camera=None):
         """Verify that the calibration meets the verification criteria.
 
         Parameters
@@ -85,6 +105,8 @@ def verify(self, calib, statisticsDict):
             should have keys that are statistic names (`str`) with
             values that are some sort of scalar (`int` or `float` are
             the mostly likely types).
+        camera : `lsst.afw.cameraGeom.Camera`, optional
+            Input camera.
 
         Returns
         -------