diff --git a/python/lsst/drp/tasks/forcedPhotCoadd.py b/python/lsst/drp/tasks/forcedPhotCoadd.py index d8440563..bdbb6321 100644 --- a/python/lsst/drp/tasks/forcedPhotCoadd.py +++ b/python/lsst/drp/tasks/forcedPhotCoadd.py @@ -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( @@ -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") @@ -145,7 +145,7 @@ 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( @@ -153,7 +153,7 @@ class ForcedPhotCoaddConfig(pipeBase.PipelineTaskConfig, pipelineConnections=For 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, @@ -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") @@ -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) @@ -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. @@ -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"]