Normalize DRP pipeline

in preparation for running on other cameras:
  - Move gen3 specific configs to pipe_tasks
  - Make override files in config/ for tasks that changed
    DefaultName
  - Remove configs redundant with those in config/ now that
    they are picked up by pipetask run

config/makeCoaddTempExp.py

@@ -1,12 +1,3 @@
 import os.path
-
-# Load configs shared between assembleCoadd and makeCoaddTempExp
-config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py"))
-
-config.makePsfMatched = True
-config.doApplySkyCorr = True
-
-config.modelPsf.defaultFwhm = 7.7
-config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
-config.warpAndPsfMatch.warp.warpingKernelName = 'lanczos5'
-config.coaddPsf.warpingKernelName = 'lanczos5'
+# makeWarp Gen3 will supersede makeCoaddTempExp.
+config.load(os.path.join(os.path.dirname(__file__), "makeWarp.py"))

config/makeWarp.py

@@ -0,0 +1,12 @@
+import os.path
+
+# Load configs shared between assembleCoadd and makeWarp
+config.load(os.path.join(os.path.dirname(__file__), "coaddBase.py"))
+
+config.makePsfMatched = True
+config.doApplySkyCorr = True
+
+config.modelPsf.defaultFwhm = 7.7
+config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
+config.warpAndPsfMatch.warp.warpingKernelName = 'lanczos5'
+config.coaddPsf.warpingKernelName = 'lanczos5'

config/mergeCoaddDetections.py

@@ -1 +1,4 @@
-config.priorityList = ["i", "r", "z", "y", "g", "N921", "N816", "N1010", "N387", "N515"]
+import os.path
+# Gen3 mergeDetections will supersede mergeCoaddDetections
+# Keep in sync in the meantime
+config.load(os.path.join(os.path.dirname(__file__), "mergeDetections.py"))

config/mergeCoaddMeasurements.py

@@ -1 +1,4 @@
-config.priorityList = ["i", "r", "z", "y", "g", "N921", "N816", "N1010", "N387", "N515"]
+import os.path
+# Gen3 mergeMeasurements will supersede mergeCoaddMeasurements
+# Keep in sync in the meantime
+config.load(os.path.join(os.path.dirname(__file__), "mergeMeasurements.py"))

config/mergeDetections.py

@@ -0,0 +1 @@
+config.priorityList = ["i", "r", "z", "y", "g", "N921", "N816", "N1010", "N387", "N515"]

config/mergeMeasurements.py

@@ -0,0 +1 @@
+config.priorityList = ["i", "r", "z", "y", "g", "N921", "N816", "N1010", "N387", "N515"]

pipelines/DRP.yaml

@@ -6,23 +6,11 @@ tasks:
   makeWarp:
     class: lsst.pipe.tasks.makeCoaddTempExp.MakeWarpTask
     config:
-      matchingKernelSize: 29
-      makePsfMatched: true
-      modelPsf.defaultFwhm: 7.7
+      # These are in obs_subaru because only obs_subaru/config overrides these to True
       # The application of external calibrations doesn't work with Gen3 now (DM-17062)
       doApplyExternalPhotoCalib: false
       doApplyExternalSkyWcs: false
       doApplySkyCorr: false
-      doWriteEmptyWarps: true
-      python: config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
-  mergeDetections:
-    class: lsst.pipe.tasks.mergeDetections.MergeDetectionsTask
-    config:
-      priorityList: ["i", "r", "z", "y", "g", "N921", "N816", "N1010", "N387", "N515"]
-  mergeMeasurements:
-    class: lsst.pipe.tasks.mergeMeasurements.MergeMeasurementsTask
-    config:
-      priorityList: ["i", "r", "z", "y", "g", "N921", "N816", "N1010", "N387", "N515"]
   forcedPhotCcd:
     class: lsst.meas.base.forcedPhotCcd.ForcedPhotCcdTask
     config: