Fix LATISS pipeline instrument name and inconsistencies.

lsst · Jul 1, 2020 · ebd4f28 · ebd4f28
1 parent 4db3339
commit ebd4f28
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/pipelines/latiss/cpBias.yaml b/pipelines/latiss/cpBias.yaml
@@ -1,5 +1,5 @@
 description: obs_lsst/latiss bias calibration construction
-instrument: lsst.obs.lsst.gen3.LatissInstrument
+instrument: lsst.obs.lsst.Latiss
 # Do not inherit until defect/linearize/ct work
 # inherits:
 #  location: $CP_PIPE_DIR/pipelines/cpBias.yaml
@@ -22,7 +22,7 @@ tasks:
       doApplyGains: False
       doFringe: False
   cpCombine:
-    class: lsst.cp.pipe.cpFunctions.CalibCombineTask
+    class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpBiasProc'
       connections.outputData: 'biasProposal'

diff --git a/pipelines/latiss/cpDark.yaml b/pipelines/latiss/cpDark.yaml
@@ -1,5 +1,5 @@
 description: obs_lsst/latiss dark calibration construction
-instrument: lsst.obs.lsst.gen3.LatissInstrument
+instrument: lsst.obs.lsst.Latiss
 # Do not inherit until defect/linearize/ct work
 # inherits:
 #  location: $CP_PIPE_DIR/pipelines/cpDark.yaml
@@ -8,12 +8,12 @@ tasks:
     class: lsst.ip.isr.isrTask.IsrTask
     config:
       connections.ccdExposure: 'raw'
-      connections.outputExposure: 'cpDarkISR'
+      connections.outputExposure: 'cpDarkIsr'
       doBias: True
       doVariance: True
-      doLinearize: True
-      doCrosstalk: True
-      doDefect: True
+      doLinearize: False
+      doCrosstalk: False
+      doDefect: False
       doNanMasking: True
       doInterpolate: True
       doBrighterFatter: False
@@ -24,10 +24,10 @@ tasks:
   cpDark:
     class: lsst.cp.pipe.cpDarkTask.CpDarkTask
     config:
-      connections.inputExp: 'cpDarkISR'
+      connections.inputExp: 'cpDarkIsr'
       connections.outputExp: 'cpDarkProc'
   cpCombine:
-    class: lsst.cp.pipe.cpFunctions.CalibCombineTask
+    class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpDarkProc'
       connections.outputData: 'darkProposal'

diff --git a/pipelines/latiss/cpFlat.yaml b/pipelines/latiss/cpFlat.yaml
@@ -1,5 +1,5 @@
 description: obs_lsst/latiss flat calibration construction
-instrument: lsst.obs.lsst.gen3.LatissInstrument
+instrument: lsst.obs.lsst.Latiss
 # Do not inherit until defect/linearize/ct work
 # inherits:
 #   location: $CP_PIPE_DIR/pipelines/cpFlat.yaml
@@ -21,20 +21,25 @@ tasks:
       doFlat: False
       doFringe: False
       doApplyGains: False
+  cpFlatMeasure:
+    class: lsst.cp.pipe.cpFlatNormTask.CpFlatMeasureTask
+    config:
+      connections.inputExp: 'cpFlatProc'
+      connections.outputStats: 'flatStats'
   cpFlatNorm:
     class: lsst.cp.pipe.cpFlatNormTask.CpFlatNormalizationTask
     config:
-      connections.inputExps: 'isr_metadata'
-      connections.outputScales: 'cpFlatNorm_yaml'
+      connections.inputMDs: 'flatStats'
+      connections.outputScales: 'cpFlatNormScales'
   cpCombine:
-    class: lsst.cp.pipe.cpFunctions.CalibCombineTask
+    class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpFlatProc'
-      connections.inputScales: 'cpFlatNorm_yaml'
+      connections.inputScales: 'cpFlatNormScales'
       connections.outputData: 'flatProposal'
       calibrationType: 'flat'
       calibrationDimensions: ['physical_filter']
       exposureScaling: InputList
-      scalingLevel: Amplifier
+      scalingLevel: AMP
 contracts:
   - isr.doFlat == False
diff --git a/pipelines/latiss/cpFringe.yaml b/pipelines/latiss/cpFringe.yaml
@@ -1,5 +1,5 @@
 description: obs_lsst/latiss fringe calibration construction
-instrument: lsst.obs.lsst.gen3.LatissInstrument
+instrument: lsst.obs.lsst.Latiss
 # Do not inherit until defects/linearize/ct is fixed.
 # inherits:
 #   location: $CP_PIPE_DIR/pipelines/cpFringe.yaml
@@ -8,7 +8,7 @@ tasks:
     class: lsst.ip.isr.isrTask.IsrTask
     config:
       connections.ccdExposure: 'raw'
-      connections.outputExposure: 'cpFringeISR'
+      connections.outputExposure: 'cpFringeIsr'
       doBias: True
       doVariance: True
       doLinearize: False
@@ -23,10 +23,10 @@ tasks:
   cpFringe:
     class: lsst.cp.pipe.cpFringeTask.CpFringeTask
     config:
-      connections.inputExp: 'cpFringeISR'
+      connections.inputExp: 'cpFringeIsr'
       connections.outputExp: 'cpFringeProc'
   cpCombine:
-    class: lsst.cp.pipe.cpFunctions.CalibCombineTask
+    class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpFringeProc'
       connections.outputData: 'fringeProposal'