Merge pull request #127 from lsst/tickets/DM-44232

DM-44232: Replace makeWarp with makeDirectWarp

bps/resources/LSSTCam-imSim/DRP-DP0.2.yaml

@@ -10,7 +10,9 @@
 #
 pipetask:
   # DRP tasks
-  makeWarp:
+  makeDirectWarp:
+    requestMemory: 8192
+  makePsfMatchedWarp:
     requestMemory: 8192
   assembleCoadd:
     requestMemory: 16384

pipelines/HSC/DRP-Prod.yaml

@@ -99,7 +99,8 @@ subsets:
       and CcdVisits.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection

pipelines/HSC/DRP-RC2.yaml

@@ -178,7 +178,8 @@ subsets:
       wrong (partial-visit) inputs to its 'background' connection.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection

pipelines/HSC/DRP-RC2_subset.yaml

@@ -361,7 +361,8 @@ subsets:
       Per-visit tasks. These should never be run with tract constraints
   nightlyStep3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection

pipelines/LATISS/DRP.yaml

@@ -168,7 +168,8 @@ subsets:
 
   step3a:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection

pipelines/LSSTComCamSim/DRP.yaml

@@ -79,7 +79,8 @@ subsets:
       and CcdVisits.
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection

pipelines/_ingredients/DECam/DRP.yaml

@@ -46,21 +46,24 @@ tasks:
       background_provider: "input_summary"
       connections.photoCalibName: "jointcal"
       connections.skyWcsName: "jointcal"
-  makeWarp:
-    class: lsst.pipe.tasks.makeWarp.MakeWarpTask
+  makeDirectWarp:
+    class: lsst.pipe.tasks.make_direct_warp.MakeDirectWarpTask
     config:
       # These configs match obs_subaru, to facilitate 1:1 comparisons between DECam and HSC
-      matchingKernelSize: 29
-      modelPsf.defaultFwhm: 7.7
-      warpAndPsfMatch.warp.warpingKernelName: lanczos5
+      warper.warpingKernelName: lanczos5
       coaddPsf.warpingKernelName: lanczos5
-      # Legacy DECam config to write out warps, even if they are empty
-      doWriteEmptyWarps: true
+      doSelectPreWarp: true
       python: |
-        config.warpAndPsfMatch.psfMatch.kernel['AL'].kernelSize = 29
-        config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
         from lsst.pipe.tasks.selectImages import PsfWcsSelectImagesTask
         config.select.retarget(PsfWcsSelectImagesTask)
+  makePsfMatchedWarp:
+    class: lsst.pipe.tasks.make_psf_matched_warp.MakePsfMatchedWarpTask
+    config:
+      # These configs match obs_subaru, to facilitate 1:1 comparisons between DECam and HSC
+      modelPsf.defaultFwhm: 7.7
+      python: |
+        config.psfMatch.kernel['AL'].kernelSize = 29
+        config.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
   templateGen:
     class: lsst.drp.tasks.assemble_coadd.CompareWarpAssembleCoaddTask
     config:
@@ -199,7 +202,8 @@ subsets:
     subset:
       - selectGoodSeeingVisits
       - selectDeepCoaddVisits
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - templateGen
       - deblend
       - detection

pipelines/_ingredients/DRP-minimal-calibration.yaml

@@ -18,10 +18,8 @@ tasks:
   updateVisitSummary: lsst.drp.tasks.update_visit_summary.UpdateVisitSummaryTask
   makeCcdVisitTable: lsst.pipe.tasks.postprocess.MakeCcdVisitTableTask
   makeVisitTable: lsst.pipe.tasks.postprocess.MakeVisitTableTask
-  makeWarp:
-    class: lsst.pipe.tasks.makeWarp.MakeWarpTask
-    config:
-      makePsfMatched: true
+  makeDirectWarp: lsst.pipe.tasks.make_direct_warp.MakeDirectWarpTask
+  makePsfMatchedWarp: lsst.pipe.tasks.make_psf_matched_warp.MakePsfMatchedWarpTask
   selectDeepCoaddVisits:
     class: lsst.pipe.tasks.selectImages.BestSeeingSelectVisitsTask
     config:
@@ -188,7 +186,8 @@ subsets:
       subset.
   coaddition:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - assembleCoadd
       - healSparsePropertyMaps
     description: >
@@ -248,8 +247,9 @@ 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.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"
-  - "makeWarp.warpAndPsfMatch.warp.cacheSize == assembleCoadd.coaddPsf.cacheSize"
-  - "makeWarp.matchingKernelSize == assembleCoadd.matchingKernelSize"  # TODO: Remove this in DM-44688.
+  - "'calib_psf_candidate' not in measure.propagateFlags.source_flags if makeDirectWarp.useVisitSummaryPsf else True"
+  - "'calib_psf_used' not in measure.propagateFlags.source_flags if makeDirectWarp.useVisitSummaryPsf else True"
+  - "'calib_psf_reserved' not in measure.propagateFlags.source_flags if makeDirectWarp.useVisitSummaryPsf else True"
+  - "makeDirectWarp.warper.cacheSize == assembleCoadd.coaddPsf.cacheSize"
+  - "makeDirectWarp.border >= makePsfMatchedWarp.psfMatch.kernel.active.sizeCellX"
+  - "makeDirectWarp.border >= makePsfMatchedWarp.psfMatch.kernel.active.sizeCellY"

pipelines/_ingredients/LSSTCam-imSim/DRP.yaml

@@ -161,7 +161,8 @@ subsets:
       Full collection-level tasks include: makeCcdVisitTable, makeVisitTable
   step3:
     subset:
-      - makeWarp
+      - makeDirectWarp
+      - makePsfMatchedWarp
       - selectDeepCoaddVisits
       - assembleCoadd
       - detection