Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-39841: Remove deprecated doPsfMatch field #915

Merged
merged 3 commits into from
Apr 12, 2024
Merged

DM-39841: Remove deprecated doPsfMatch field #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4e446b
Remove doPsfMatch from MakeWarp validate
arunkannawadi Apr 11, 2024
ca15bd1
Move modelPsf config field to makeWarp
arunkannawadi Apr 11, 2024
86d98c8
Remove doPsfMatch config field
arunkannawadi Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions python/lsst/pipe/tasks/coaddBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.",
Expand Down
8 changes: 2 additions & 6 deletions python/lsst/pipe/tasks/makeWarp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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. "
Expand Down Expand Up @@ -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)
Expand Down