DM-25424: Convert Defect to IsrCalib

config/defectIsr.py

@@ -0,0 +1,18 @@
+# Set ISR processing to run up until we would be applying the defect
+# correction.
+config.isr.doWrite = True
+config.isr.doOverscan = True
+config.isr.doAssembleCcd = True
+config.isr.doBias = True
+config.isr.doVariance = False
+config.isr.doLinearize = False
+config.isr.doCrosstalk = False
+config.isr.doBrighterFatter = False
+config.isr.doDark = False
+config.isr.doStrayLight = False
+config.isr.doFlat = False
+config.isr.doFringe = False
+config.isr.doApplyGains = False
+config.isr.doDefect = False
+config.isr.doSaturationInterpolation = False
+config.isr.growSaturationFootprintSize = 0

pipelines/findDefects.yaml

@@ -0,0 +1,33 @@
+description: cp_pipe DEFECT calibration construction.
+tasks:
+  isr:
+    class: lsst.ip.isr.isrTask.IsrTask
+    config:
+      connections.ccdExposure: 'raw'
+      connections.outputExposure: 'cpDefectsProc'
+      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: False
+      doSaturationInterpolation: False
+      growSaturationFootprintSize: 0
+  measureDefects:
+    class: lsst.cp.pipe.defects.MeasureDefectsTask
+    config:
+      connections.inputExp: 'cpDefectsProc'
+      connections.outputDefects: 'cpPartialDefects'
+  mergeDefects:
+    class: lsst.cp.pipe.defects.MergeDefectsTask
+    config:
+      connections.inputDefects: 'cpPartialDefects'
+      connections.mergedDefects: 'defects'

python/lsst/cp/pipe/cpFlatNormTask.py

@@ -27,6 +27,7 @@
 import lsst.pipe.base as pipeBase
 import lsst.pipe.base.connectionTypes as cT
 from lsst.cp.pipe.cpCombine import VignetteExposure
+from lsst.cp.pipe.utils import ddict2dict
 
 from ._lookupStaticCalibration import lookupStaticCalibration
 
@@ -308,7 +309,7 @@ def run(self, inputMDs, inputDims, camera):
                     outputScales['detScale'][det][amp.getName()] = detScales[detAmpId].tolist()
 
         return pipeBase.Struct(
-            outputScales=outputScales,
+            outputScales=ddict2dict(outputScales),
         )
 
     def measureScales(self, bgMatrix, bgCounts=None, iterations=10):