Merge pull request #915 from lsst/tickets/DM-39841

DM-39841: Remove deprecated doPsfMatch field

python/lsst/pipe/tasks/coaddBase.py

@@ -24,7 +24,6 @@
 import lsst.pex.config as pexConfig
 import lsst.afw.image as afwImage
 import lsst.pipe.base as pipeBase
-import lsst.meas.algorithms as measAlg
 import lsst.geom as geom
 
 from lsst.meas.algorithms import ScaleVarianceTask
@@ -56,13 +55,6 @@ class CoaddBaseConfig(pexConfig.Config):
         doc="Subtask that helps fill CoaddInputs catalogs added to the final Exposure",
         target=CoaddInputRecorderTask
     )
-    doPsfMatch = pexConfig.Field(
-        dtype=bool,
-        doc="Match to modelPsf? Sets makePsfMatched=True, makeDirect=False",
-        deprecated="This field is no longer used. Will be removed after v26.",  # TODO: DM-39841
-        default=False
-    )
-    modelPsf = measAlg.GaussianPsfFactory.makeField(doc="Model Psf factory")
     includeCalibVar = pexConfig.Field(
         dtype=bool,
         doc="Add photometric calibration variance to warp variance plane.",

python/lsst/pipe/tasks/makeWarp.py

@@ -33,7 +33,7 @@
 import lsst.geom
 from lsst.daf.butler import DeferredDatasetHandle
 from lsst.meas.base import DetectorVisitIdGeneratorConfig
-from lsst.meas.algorithms import CoaddPsf, CoaddPsfConfig
+from lsst.meas.algorithms import CoaddPsf, CoaddPsfConfig, GaussianPsfFactory
 from lsst.skymap import BaseSkyMap
 from lsst.utils.timer import timeMethod
 from .coaddBase import CoaddBaseTask, makeSkyInfo, reorderAndPadList
@@ -139,6 +139,7 @@ class MakeWarpConfig(pipeBase.PipelineTaskConfig, CoaddBaseTask.ConfigClass,
         dtype=bool,
         default=False,
     )
+    modelPsf = GaussianPsfFactory.makeField(doc="Model Psf factory")
     useVisitSummaryPsf = pexConfig.Field(
         doc=(
             "If True, use the PSF model and aperture corrections from the 'visitSummary' connection. "
@@ -169,11 +170,6 @@ def validate(self):
 
         if not self.makePsfMatched and not self.makeDirect:
             raise RuntimeError("At least one of config.makePsfMatched and config.makeDirect must be True")
-        if self.doPsfMatch:  # TODO: Remove this in DM-39841
-            # Backwards compatibility.
-            log.warning("Config doPsfMatch deprecated. Setting makePsfMatched=True and makeDirect=False")
-            self.makePsfMatched = True
-            self.makeDirect = False
 
     def setDefaults(self):
         CoaddBaseTask.ConfigClass.setDefaults(self)