Merge pull request #74 from lsst/tickets/DM-39227

DM-39227: remove +fakes pipelines and adapt to upstream deprecations
lsst · Jul 13, 2023 · 836f59c · 836f59c
2 parents 12af59d + 39e08a0
commit 836f59c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 175 deletions.
diff --git a/pipelines/HSC/DRP-RC2+fakes.yaml b/pipelines/HSC/DRP-RC2+fakes.yaml
diff --git a/pipelines/HSC/DRP-ci_hsc+fakes.yaml b/pipelines/HSC/DRP-ci_hsc+fakes.yaml
diff --git a/pipelines/_ingredients/DECam/DRP.yaml b/pipelines/_ingredients/DECam/DRP.yaml
@@ -54,7 +54,6 @@ tasks:
       modelPsf.defaultFwhm: 7.7
       warpAndPsfMatch.warp.warpingKernelName: lanczos5
       coaddPsf.warpingKernelName: lanczos5
-      connections.skyWcsName: jointcal
       # Legacy DECam config to write out warps, even if they are empty
       doWriteEmptyWarps: true
       python: |
@@ -112,7 +111,6 @@ tasks:
     class: lsst.pipe.tasks.postprocess.WriteRecalibratedSourceTableTask
     config:
       connections.outputCatalog: source
-      connections.skyWcsName: jointcal
   jointcal:
     class: lsst.jointcal.JointcalTask
     config:

diff --git a/pipelines/_ingredients/DRP-minimal-calibration.yaml b/pipelines/_ingredients/DRP-minimal-calibration.yaml
@@ -236,6 +236,6 @@ contracts:
   - drpAssociation.connections.diaObjectTable == drpDiaCalculation.connections.diaObjectTable
   - forcedPhotDiffim.connections.refCat == forcedPhotCcd.connections.refCat
   - consolidateHealSparsePropertyMaps.property_maps == healSparsePropertyMaps.property_maps
-  - "'calib_psf_candidate' not in measure.propagateFlags.source_flags if makeWarp.doApplyFinalizedPsf else True"
-  - "'calib_psf_used' not in measure.propagateFlags.source_flags if makeWarp.doApplyFinalizedPsf else True"
-  - "'calib_psf_reserved' not in measure.propagateFlags.source_flags if makeWarp.doApplyFinalizedPsf else True"
+  - "'calib_psf_candidate' not in measure.propagateFlags.source_flags if makeWarp.useVisitSummaryPsf else True"
+  - "'calib_psf_used' not in measure.propagateFlags.source_flags if makeWarp.useVisitSummaryPsf else True"
+  - "'calib_psf_reserved' not in measure.propagateFlags.source_flags if makeWarp.useVisitSummaryPsf else True"
diff --git a/pipelines/_ingredients/HSC/DRP+fakes.yaml b/pipelines/_ingredients/HSC/DRP+fakes.yaml