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

Revert deblender sprint merge to master #292

Merged
merged 1 commit into from
May 16, 2019
Merged

Revert deblender sprint merge to master #292

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions python/lsst/pipe/tasks/multiBand.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
from lsst.pex.config import Config, Field, ConfigurableField
from lsst.meas.algorithms import DynamicDetectionTask, ReferenceObjectLoader
from lsst.meas.base import SingleFrameMeasurementTask, ApplyApCorrTask, CatalogCalculationTask
from lsst.meas.deblender import SourceDeblendTask
from lsst.meas.extensions.scarlet import ScarletDeblendTask
from lsst.meas.deblender import SourceDeblendTask, MultibandDeblendTask
from lsst.pipe.tasks.coaddBase import getSkyInfo
from lsst.pipe.tasks.scaleVariance import ScaleVarianceTask
from lsst.meas.astrom import DirectMatchTask, denormalizeMatches
Expand Down Expand Up @@ -342,7 +341,7 @@ class DeblendCoaddSourcesConfig(Config):
"""
singleBandDeblend = ConfigurableField(target=SourceDeblendTask,
doc="Deblend sources separately in each band")
multiBandDeblend = ConfigurableField(target=ScarletDeblendTask,
multiBandDeblend = ConfigurableField(target=MultibandDeblendTask,
doc="Deblend sources simultaneously across bands")
simultaneous = Field(dtype=bool, default=False, doc="Simultaneously deblend all bands?")
coaddName = Field(dtype=str, default="deep", doc="Name of coadd")
Expand Down Expand Up @@ -476,8 +475,7 @@ def runDataRef(self, patchRefList, psfCache=100):
exposure = afwImage.MultibandExposure.fromExposures(filters, exposures)
fluxCatalogs, templateCatalogs = self.multiBandDeblend.run(exposure, sources)
for n in range(len(patchRefList)):
fluxCat = fluxCatalogs if fluxCatalogs is None else fluxCatalogs[filters[n]]
self.write(patchRefList[n], fluxCat, templateCatalogs[filters[n]])
self.write(patchRefList[n], fluxCatalogs[filters[n]], templateCatalogs[filters[n]])
else:
# Use the singeband deblender to deblend each band separately
for patchRef in patchRefList:
Expand Down Expand Up @@ -536,14 +534,13 @@ def write(self, dataRef, flux_sources, template_sources=None):
if flux_sources is not None:
assert not self.config.simultaneous or self.config.multiBandDeblend.conserveFlux
dataRef.put(flux_sources, self.config.coaddName + "Coadd_deblendedFlux")
self.log.info("Wrote %d sources: %s" % (len(flux_sources), dataRef.dataId))
# Only the multiband deblender has the option to output the
# template model catalog, which can optionally be used
# in MeasureMergedCoaddSources
if template_sources is not None:
assert self.config.multiBandDeblend.saveTemplates
dataRef.put(template_sources, self.config.coaddName + "Coadd_deblendedModel")
self.log.info("Wrote %d sources: %s" % (len(template_sources), dataRef.dataId))
self.log.info("Wrote %d sources: %s" % (len(flux_sources), dataRef.dataId))

def writeMetadata(self, dataRefList):
"""Write the metadata produced from processing the data.
Expand Down