Skip to content

DM-54625: Support partial outputs for detection on the preconvolved diffim #453

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

Open
isullivan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DM-54625: Support partial outputs for detection on the preconvolved diffim #453

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
27 changes: 18 additions & 9 deletions python/lsst/ip/diffim/detectAndMeasure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ class DetectAndMeasureScoreTask(DetectAndMeasureTask):

@timeMethod
def run(self, science, matchedTemplate, difference, scoreExposure, kernelSources,
idFactory=None):
idFactory=None, measurementResults=None):
"""Detect and measure sources on a score image.

Parameters
Expand All @@ -1388,6 +1388,10 @@ def run(self, science, matchedTemplate, difference, scoreExposure, kernelSources
Generator object used to assign ids to detected sources in the
difference image. Ids from this generator are not set until after
deblending and merging positive/negative peaks.
measurementResults : `lsst.pipe.base.Struct`, optional
Result struct that is modified to allow saving of partial outputs
for some failure conditions. If the task completes successfully,
this is also returned.

Returns
-------
Expand All @@ -1398,6 +1402,8 @@ def run(self, science, matchedTemplate, difference, scoreExposure, kernelSources
``diaSources`` : `lsst.afw.table.SourceCatalog`
The catalog of detected sources.
"""
if measurementResults is None:
measurementResults = pipeBase.Struct()
if idFactory is None:
idFactory = lsst.meas.base.IdGenerator().make_table_id_factory()

Expand All @@ -1420,17 +1426,20 @@ def run(self, science, matchedTemplate, difference, scoreExposure, kernelSources
results.positive,
results.negative)

return self.processResults(science, matchedTemplate, difference,
sources, idFactory, kernelSources,
positives=positives,
negatives=negatives)
self.processResults(science, matchedTemplate, difference,
sources, idFactory, kernelSources,
positives=positives,
negatives=negatives,
measurementResults=measurementResults)

else:
positives = afwTable.SourceCatalog(self.schema)
results.positive.makeSources(positives)
negatives = afwTable.SourceCatalog(self.schema)
results.negative.makeSources(negatives)
return self.processResults(science, matchedTemplate, difference,
results.sources, idFactory, kernelSources,
positives=positives,
negatives=negatives)
self.processResults(science, matchedTemplate, difference,
results.sources, idFactory, kernelSources,
positives=positives,
negatives=negatives,
measurementResults=measurementResults)
return measurementResults
Loading