Skip to content

DM-52564: Update to new scarlet API for isolated sources #155

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

Merged
merged 1 commit into from
Oct 20, 2025
Merged

DM-52564: Update to new scarlet API for isolated sources #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions python/lsst/drp/tasks/forcedPhotCoadd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ForcedPhotCoaddConnections(
scarletModels = pipeBase.connectionTypes.Input(
doc="Multiband scarlet models produced by the deblender",
name="{inputCoaddName}Coadd_scarletModelData",
storageClass="ScarletModelData",
storageClass="LsstScarletModelData",
dimensions=("tract", "patch", "skymap"),
)
refWcs = pipeBase.connectionTypes.Input(
Expand All @@ -106,7 +106,7 @@ def __init__(self, *, config=None):
if config is None:
return

if config.footprintDatasetName != "ScarletModelData":
if config.footprintDatasetName != "LsstScarletModelData":
self.inputs.remove("scarletModels")
if config.footprintDatasetName != "DeblendedFlux":
self.inputs.remove("footprintCatInBand")
Expand Down Expand Up @@ -145,15 +145,15 @@ class ForcedPhotCoaddConfig(pipeBase.PipelineTaskConfig, pipelineConnections=For
"Must have IDs that match those of the reference catalog."
"If None, Footprints will be generated by transforming the reference Footprints.",
dtype=str,
default="ScarletModelData",
default="LsstScarletModelData",
optional=True,
)
doConserveFlux = lsst.pex.config.Field(
dtype=bool,
default=True,
doc="Whether to use the deblender models as templates to re-distribute the flux "
"from the 'exposure' (True), or to perform measurements on the deblender model footprints. "
"If footprintDatasetName != 'ScarletModelData' then this field is ignored.",
"If footprintDatasetName != 'LsstScarletModelData' then this field is ignored.",
)
doStripFootprints = lsst.pex.config.Field(
dtype=bool,
Expand Down Expand Up @@ -237,7 +237,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
inputs = butlerQC.get(inputRefs)

refCatInBand = inputs.pop("refCatInBand")
if self.config.footprintDatasetName == "ScarletModelData":
if self.config.footprintDatasetName == "LsstScarletModelData":
footprintData = inputs.pop("scarletModels")
elif self.config.footprintDatasetName == "DeblendedFlux":
footprintData = inputs.pop("footprintCatIndBand")
Expand Down Expand Up @@ -279,7 +279,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
apCorrMap=apCorrMap,
)
# Strip HeavyFootprints to save space on disk
if self.config.footprintDatasetName == "ScarletModelData" and self.config.doStripFootprints:
if self.config.footprintDatasetName == "LsstScarletModelData" and self.config.doStripFootprints:
sources = outputs.measCat
for source in sources[sources["parent"] != 0]:
source.setFootprint(None)
Expand All @@ -302,7 +302,7 @@ def generateMeasCat(self, dataId, exposure, refCat, refCatInBand, refWcs, footpr
refWcs : `lsst.afw.image.SkyWcs`
Reference world coordinate system.
footprintData : `ScarletDataModel` or `lsst.afw.table.SourceCatalog`
Either the scarlet data models or the deblended catalog containing
Either the scarlet data models or the deblended catalog containings
footprints. If `footprintData` is `None` then the footprints
contained in `refCatInBand` are used.

Expand All @@ -325,7 +325,7 @@ def generateMeasCat(self, dataId, exposure, refCat, refCatInBand, refWcs, footpr
exposure, refCat, refWcs, idFactory=id_generator.make_table_id_factory()
)
# attach footprints here as this can naturally live inside this method
if self.config.footprintDatasetName == "ScarletModelData":
if self.config.footprintDatasetName == "LsstScarletModelData":
# Load the scarlet models
self._attachScarletFootprints(
catalog=measCat, modelData=footprintData, exposure=exposure, band=dataId["band"]
Expand Down