Merge pull request #806 from lsst/tickets/DM-39840

DM-39840: Deprecate doPsfMatch field in coaddBase
lsst · Jun 30, 2023 · cd77afb · cd77afb
2 parents 8748632 + 3770491
commit cd77afb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/python/lsst/pipe/tasks/assembleCoadd.py b/python/lsst/pipe/tasks/assembleCoadd.py
@@ -244,7 +244,7 @@ def setDefaults(self):
 
     def validate(self):
         super().validate()
-        if self.doPsfMatch:
+        if self.doPsfMatch:  # TODO: Remove this in DM-39841
             # Backwards compatibility.
             # Configs do not have loggers
             log.warning("Config doPsfMatch deprecated. Setting warpType='psfMatched'")

diff --git a/python/lsst/pipe/tasks/coaddBase.py b/python/lsst/pipe/tasks/coaddBase.py
@@ -57,7 +57,8 @@ class CoaddBaseConfig(pexConfig.Config):
     )
     doPsfMatch = pexConfig.Field(
         dtype=bool,
-        doc="Match to modelPsf? Deprecated. Sets makePsfMatched=True, makeDirect=False",
+        doc="Match to modelPsf? Sets makePsfMatched=True, makeDirect=False",
+        deprecated="This field is no longer used. Will be removed after v27.",  # TODO: DM-39841
         default=False
     )
     modelPsf = measAlg.GaussianPsfFactory.makeField(doc="Model Psf factory")

diff --git a/python/lsst/pipe/tasks/makeWarp.py b/python/lsst/pipe/tasks/makeWarp.py
@@ -244,7 +244,7 @@ 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:
+        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