Merge branch 'tickets/DM-41351'

lsst · Oct 27, 2023 · 9dd2c6f · 9dd2c6f
2 parents b5a0ed1 + 76c3e14
commit 9dd2c6f
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/pipelines/HyperSuprimeCam/cpBias.yaml b/pipelines/HyperSuprimeCam/cpBias.yaml
@@ -1,4 +1,4 @@
 description: obs_subaru/HSC bias calibration construction
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
-  location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
diff --git a/pipelines/HyperSuprimeCam/cpDark.yaml b/pipelines/HyperSuprimeCam/cpDark.yaml
@@ -1,4 +1,4 @@
 description: obs_subaru/HSC dark calibration construction
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
-  location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
diff --git a/pipelines/HyperSuprimeCam/cpFlat.yaml b/pipelines/HyperSuprimeCam/cpFlat.yaml
@@ -1,4 +1,4 @@
 description: obs_subaru/HSC flat calibration construction
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
-  location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlat.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpFlat.yaml
diff --git a/pipelines/HyperSuprimeCam/cpFringe.yaml b/pipelines/HyperSuprimeCam/cpFringe.yaml
@@ -1,4 +1,4 @@
 description: obs_subaru/HSC fringe calibration construction
 instrument: lsst.obs.subaru.HyperSuprimeCam
 imports:
-  location: $CP_PIPE_DIR/pipelines/_ingredients/cpFringe.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpFringe.yaml
diff --git a/pipelines/Latiss/cpDark.yaml b/pipelines/Latiss/cpDark.yaml
@@ -1,7 +1,7 @@
 description: Latiss dark calibration construction
 instrument: lsst.obs.lsst.Latiss
 imports:
-  -  location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpDark.yaml
 tasks:
   darkIsr:
     class: lsst.ip.isr.IsrTask

diff --git a/pipelines/Latiss/cpDarkSkipCosmics.yaml b/pipelines/Latiss/cpDarkSkipCosmics.yaml
@@ -1,9 +1,9 @@
 description: Latiss dark calibration construction
 instrument: lsst.obs.lsst.Latiss
 imports:
-  -  location: $CP_PIPE_DIR/pipelines/_ingredients/cpDarkSkipCosmics.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpDarkSkipCosmics.yaml
 tasks:
-  isr:
+  darkIsr:
     class: lsst.ip.isr.IsrTask
     config:
       # Disable these until valid calibrations exist.

diff --git a/pipelines/Latiss/cpSky.yaml b/pipelines/Latiss/cpSky.yaml
@@ -1,7 +1,7 @@
 description: Sky frame generation pipeline definition.
 instrument: lsst.obs.lsst.Latiss
 imports:
-  -  location: $CP_PIPE_DIR/pipelines/_ingredients/cpSky.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpSky.yaml
 tasks:
   skyIsr:
     class: lsst.ip.isr.isrTask.IsrTask

diff --git a/pipelines/LsstCam/cpPtc.yaml b/pipelines/LsstCam/cpPtc.yaml
@@ -3,7 +3,7 @@ instrument: lsst.obs.lsst.LsstCam
 imports:
   - location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtc.yaml
 tasks:
-  isr:
+  ptcIsr:
     class: lsst.ip.isr.IsrTask
     config:
       deferredChargeCorrection.useGains: true

diff --git a/pipelines/LsstCamImSim/cpBias.yaml b/pipelines/LsstCamImSim/cpBias.yaml
@@ -1,7 +1,7 @@
 description: ImSim bias calibration construction
 instrument: lsst.obs.lsst.LsstCamImSim
 imports:
- - location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
 tasks:
   biasIsr:
     class: lsst.ip.isr.IsrTask

diff --git a/pipelines/LsstComCam/cpBias.yaml b/pipelines/LsstComCam/cpBias.yaml
@@ -1,7 +1,7 @@
 description: ComCam bias calibration construction
 instrument: lsst.obs.lsst.LsstComCam
 imports:
- - location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
+  - location: $CP_PIPE_DIR/pipelines/_ingredients/cpBias.yaml
 tasks:
   biasIsr:
     class: lsst.ip.isr.IsrTask

diff --git a/pipelines/LsstTS8/cpDeferredCharge.yaml b/pipelines/LsstTS8/cpDeferredCharge.yaml
@@ -3,7 +3,7 @@ instrument: lsst.obs.lsst.LsstTS8
 imports:
   - location: $CP_PIPE_DIR/pipelines/_ingredients/cpDeferredCharge.yaml
 tasks:
-  isr:
+  ctiIsr:
     class: lsst.ip.isr.IsrTask
     config:
       overscan.fitType: 'MEDIAN_PER_ROW'

diff --git a/pipelines/LsstTS8/cpPtc.yaml b/pipelines/LsstTS8/cpPtc.yaml
@@ -3,7 +3,7 @@ instrument: lsst.obs.lsst.LsstTS8
 imports:
   - location: $CP_PIPE_DIR/pipelines/_ingredients/cpPtc.yaml
 tasks:
-  isr:
+  ptcIsr:
     class: lsst.ip.isr.IsrTask
     config:
       deferredChargeCorrection.useGains: true

diff --git a/pipelines/_ingredients/cpDarkSkipCosmics.yaml b/pipelines/_ingredients/cpDarkSkipCosmics.yaml
@@ -1,6 +1,6 @@
 description: cp_pipe DARK calibration construction
 tasks:
-  isr:
+  darkIsr:
     class: lsst.ip.isr.IsrTask
     config:
       connections.ccdExposure: 'raw'