Merge branch 'tickets/DM-29589'

lsst · Apr 8, 2021 · 5277551 · 5277551
2 parents 434b3eb + 6c9bc45
commit 5277551
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/pipelines/cpBias.yaml b/pipelines/cpBias.yaml
@@ -17,7 +17,7 @@ tasks:
       doFlat: False
       doApplyGains: False
       doFringe: False
-  cpCombine:
+  cpBiasCombine:
     class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpBiasProc'
@@ -26,5 +26,5 @@ tasks:
       exposureScaling: "Unity"
 contracts:
   - isr.doBias == False
-  - cpCombine.calibrationType == "bias"
-  - cpCombine.exposureScaling == "Unity"
+  - cpBiasCombine.calibrationType == "bias"
+  - cpBiasCombine.exposureScaling == "Unity"
diff --git a/pipelines/cpDark.yaml b/pipelines/cpDark.yaml
@@ -22,7 +22,7 @@ tasks:
     config:
       connections.inputExp: 'cpDarkIsr'
       connections.outputExp: 'cpDarkProc'
-  cpCombine:
+  cpDarkCombine:
     class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpDarkProc'
@@ -32,5 +32,5 @@ tasks:
       python: config.mask.append("CR")
 contracts:
   - isr.doDark == False
-  - cpCombine.calibrationType == "dark"
-  - cpCombine.exposureScaling == "DarkTime"
+  - cpDarkCombine.calibrationType == "dark"
+  - cpDarkCombine.exposureScaling == "DarkTime"
diff --git a/pipelines/cpFlat.yaml b/pipelines/cpFlat.yaml
@@ -27,7 +27,7 @@ tasks:
     config:
       connections.inputMDs: 'flatStats'
       connections.outputScales: 'cpFlatNormScales'
-  cpCombine:
+  cpFlatCombine:
     class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpFlatProc'

diff --git a/pipelines/cpFlatSingleChip.yaml b/pipelines/cpFlatSingleChip.yaml
@@ -17,7 +17,7 @@ tasks:
       doFlat: False
       doFringe: False
       doApplyGains: False
-  cpCombine:
+  cpFlatCombine:
     class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpFlatProc'
@@ -27,4 +27,4 @@ tasks:
       exposureScaling: MeanStats
 contracts:
   - isr.doFlat == False
-  - cpCombine.calibrationType == "flat"
+  - cpFlatCombine.calibrationType == "flat"
diff --git a/pipelines/cpFringe.yaml b/pipelines/cpFringe.yaml
@@ -21,7 +21,7 @@ tasks:
     config:
       connections.inputExp: 'cpFringeIsr'
       connections.outputExp: 'cpFringeProc'
-  cpCombine:
+  cpFringeCombine:
     class: lsst.cp.pipe.cpCombine.CalibCombineTask
     config:
       connections.inputExps: 'cpFringeProc'
@@ -31,5 +31,5 @@ tasks:
       exposureScaling: "Unity"
 contracts:
   - isr.doFringe == False
-  - cpCombine.calibrationType == "fringe"
-  - cpCombine.exposureScaling == "Unity"
+  - cpFringeCombine.calibrationType == "fringe"
+  - cpFringeCombine.exposureScaling == "Unity"