Replace makeWarp in Merian pipeline

pipelines/_ingredients/DECam/DRP.yaml

@@ -46,20 +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'].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.MakePsfMatchedWarp
+    config:
+      # These configs match obs_subaru, to facilitate 1:1 comparisons between DECam and HSC
+      matchingKernelSize: 29
+      modelPsf.defaultFwhm: 7.7
+      python: |
+        config.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
   templateGen:
     class: lsst.drp.tasks.assemble_coadd.CompareWarpAssembleCoaddTask
     config: