Skip to content

DM-52564: Update for new API for isolated source persistence #1167

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 for new API for isolated source persistence #1167

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/deblendCoaddSourcesPipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class DeblendCoaddSourcesMultiConnections(PipelineTaskConnections,
scarletModelData = cT.Output(
doc="Multiband scarlet models produced by the deblender",
name="{outputCoaddName}Coadd_scarletModelData",
storageClass="ScarletModelData",
storageClass="LsstScarletModelData",
dimensions=("tract", "patch", "skymap"),
)
objectParents = cT.Output(
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/fit_coadd_multiband.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class CoaddMultibandFitInputConnections(
models_scarlet = pipeBase.connectionTypes.Input(
doc="Multiband scarlet models produced by the deblender",
name="{name_coadd}Coadd_scarletModelData",
storageClass="ScarletModelData",
storageClass="LsstScarletModelData",
dimensions=("tract", "patch", "skymap"),
)

Expand Down
7 changes: 3 additions & 4 deletions python/lsst/pipe/tasks/measurementDriver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import lsst.meas.deblender as measDeblender
import lsst.meas.extensions.scarlet as scarlet
import lsst.pipe.base as pipeBase
import lsst.scarlet.lite as scl
import numpy as np
from lsst.meas.extensions.scarlet.deconvolveExposureTask import DeconvolveExposureTask
from lsst.pex.config import Config, ConfigurableField, Field
Expand Down Expand Up @@ -983,7 +982,7 @@ def __init__(self, *args, **kwargs):

# Placeholder for the model data produced by the deblender. Caching
# this data has proven be useful for debugging.
self.modelData: scl.io.ScarletModelData
self.modelData: scarlet.io.LsstScarletModelData

def run(
self,
Expand Down Expand Up @@ -1047,7 +1046,7 @@ def run(
be None if detection is disabled.
``modelData``
Multiband scarlet models produced during deblending
(`~lsst.scarlet.lite.io.ScarletModelData`). Will be None if
(`~scarlet.io.LsstScarletModelData`). Will be None if
deblending is disabled.
"""

Expand Down Expand Up @@ -1274,7 +1273,7 @@ def _deblendSources(
mDeconvolved: afwImage.MultibandExposure | None,
catalog: afwTable.SourceCatalog,
refBand: str,
) -> tuple[dict[str, afwTable.SourceCatalog], scl.io.ScarletModelData]:
) -> tuple[dict[str, afwTable.SourceCatalog], scarlet.io.LsstScarletModelData]:
"""Run multi-band deblending given a multi-band exposure and a catalog.

Parameters
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/pipe/tasks/multiBand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ class MeasureMergedCoaddSourcesConnections(
scarletModels = cT.Input(
doc="Multiband scarlet models produced by the deblender",
name="{inputCoaddName}Coadd_scarletModelData",
storageClass="ScarletModelData",
storageClass="LsstScarletModelData",
dimensions=("tract", "patch", "skymap"),
)
outputSources = cT.Output(
Expand Down
1 change: 1 addition & 0 deletions tests/test_isPrimaryFlag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ def testIsScarletPrimaryFlag(self):
scarletConfig = ScarletDeblendTask.ConfigClass()
scarletConfig.maxIter = 20
scarletConfig.columnInheritance["merge_peak_sky"] = "merge_peak_sky"
scarletConfig.processSingles = True
deblendTask = ScarletDeblendTask(schema=schema, config=scarletConfig)

# We'll customize the configuration of measurement to just run the
Expand Down