fixup

Author: abudlong

python/lsst/pipe/tasks/dcr_multiBand.py

@@ -21,28 +21,20 @@
 
 __all__ = ["DetectCoaddSourcesConfig", "DetectCoaddSourcesTask"]
 
-from lsst.pipe.base import (Struct, PipelineTask, PipelineTaskConfig, PipelineTaskConnections)
+from lsst.pipe.base import Struct
 import lsst.pipe.base.connectionTypes as cT
-from lsst.pex.config import Field, ConfigurableField, ChoiceField
-from lsst.meas.algorithms import DynamicDetectionTask, ReferenceObjectLoader, ScaleVarianceTask, \
-    SetPrimaryFlagsTask
-from lsst.meas.base import (
-    SingleFrameMeasurementTask,
-    ApplyApCorrTask,
-    CatalogCalculationTask,
-    SkyMapIdGeneratorConfig,
-)
+from lsst.pex.config import Field, ConfigurableField
+from lsst.meas.algorithms import DynamicDetectionTask, ReferenceObjectLoader, ScaleVarianceTask
+from lsst.meas.base import SkyMapIdGeneratorConfig
 from lsst.meas.extensions.scarlet.io import updateCatalogFootprints
-from lsst.meas.astrom import DirectMatchTask, denormalizeMatches
-from lsst.pipe.tasks.propagateSourceFlags import PropagateSourceFlagsTask
+from lsst.meas.astrom import denormalizeMatches
 from lsst.pipe.tasks.multiBand import (MeasureMergedCoaddSourcesConnections,
                                        MeasureMergedCoaddSourcesConfig, MeasureMergedCoaddSourcesTask,
                                        DetectCoaddSourcesConnections, DetectCoaddSourcesConfig,
                                        DetectCoaddSourcesTask)
 import lsst.afw.table as afwTable
 import lsst.afw.math as afwMath
 from lsst.daf.base import PropertyList
-from lsst.skymap import BaseSkyMap
 
 # NOTE: these imports are a convenience so multiband users only have to import this file.
 from .mergeDetections import MergeDetectionsConfig, MergeDetectionsTask  # noqa: F401
@@ -251,57 +243,12 @@ class DcrMeasureMergedCoaddSourcesConnections(
         name="{inputCoaddName}Coadd_meas_schema",
         storageClass="SourceCatalog"
     )
-    # TODO[DM-47797]: remove this deprecated connection.
-    # refCat = cT.PrerequisiteInput(
-    #     doc="Reference catalog used to match measured sources against known sources",
-    #     name="ref_cat",
-    #     storageClass="SimpleCatalog",
-    #     dimensions=("skypix",),
-    #     deferLoad=True,
-    #     multiple=True,
-    #     deprecated="Reference matching in measureCoaddSources will be removed after v29.",
-    # )
     exposure = cT.Input(
         doc="Input coadd image",
         name="{inputCoaddName}Coadd_calexp",
         storageClass="ExposureF",
         dimensions=("tract", "patch", "band", "subfilter", "skymap")
     )
-    # skyMap = cT.Input(
-    #     doc="SkyMap to use in processing",
-    #     name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
-    #     storageClass="SkyMap",
-    #     dimensions=("skymap",),
-    # )
-    # # TODO[DM-47424]: remove this deprecated connection.
-    # visitCatalogs = cT.Input(
-    #     doc="Deprecated and unused.",
-    #     name="src",
-    #     dimensions=("instrument", "visit", "detector"),
-    #     storageClass="SourceCatalog",
-    #     multiple=True,
-    #     deprecated="Deprecated and unused.  Will be removed after v29.",
-    # )
-    # sourceTableHandles = cT.Input(
-    #     doc=("Source tables that are derived from the ``CalibrateTask`` sources. "
-    #          "These tables contain astrometry and photometry flags, and optionally "
-    #          "PSF flags."),
-    #     name="sourceTable_visit",
-    #     storageClass="ArrowAstropy",
-    #     dimensions=("instrument", "visit"),
-    #     multiple=True,
-    #     deferLoad=True,
-    # )
-    # finalizedSourceTableHandles = cT.Input(
-    #     doc=("Finalized source tables from ``FinalizeCalibrationTask``. These "
-    #          "tables contain PSF flags from the finalized PSF estimation."),
-    #     name="finalized_src_table",
-    #     storageClass="ArrowAstropy",
-    #     dimensions=("instrument", "visit"),
-    #     multiple=True,
-    #     deferLoad=True,
-    # )
-    # # TODO[DM-47797]: remove this deprecated connection.
     inputCatalog = cT.Input(
         doc=("Name of the input catalog to use."
              "If the single band deblender was used this should be 'deblendedFlux."
@@ -354,121 +301,13 @@ class DcrMeasureMergedCoaddSourcesConnections(
 
     def __init__(self, *, config=None):
         super().__init__(config=config)
-        # # del self.visitCatalogs
-        # if not config.doPropagateFlags:
-        #     del self.sourceTableHandles
-        #     del self.finalizedSourceTableHandles
-        # else:
-        #     # Check for types of flags required.
-        #     if not config.propagateFlags.source_flags:
-        #         del self.sourceTableHandles
-        #     if not config.propagateFlags.finalized_source_flags:
-        #         del self.finalizedSourceTableHandles
-        # # TODO[DM-47797]: only the 'if' block contents here should survive.
-        # if config.inputCatalog == "deblendedCatalog":
-        #     del self.inputCatalog
-        #     if not config.doAddFootprints:
-        #         del self.scarletModels
-        # else:
-        #     del self.deblendedCatalog
-        #     del self.scarletModels
-
-        # # TODO[DM-47797]: delete the conditionals below.
-        # if not config.doMatchSources:
-        #     del self.refCat
-        #     del self.matchResult
-
-        # if not config.doWriteMatchesDenormalized:
-        #     del self.denormMatches
 
 
 class DcrMeasureMergedCoaddSourcesConfig(MeasureMergedCoaddSourcesConfig,
                                          pipelineConnections=DcrMeasureMergedCoaddSourcesConnections):
     """Configuration parameters for the MeasureMergedCoaddSourcesTask
     """
-    # inputCatalog = ChoiceField(
-    #     dtype=str,
-    #     default="deblendedCatalog",
-    #     allowed={
-    #         "deblendedCatalog": "Output catalog from ScarletDeblendTask",
-    #         "deblendedFlux": "Output catalog from SourceDeblendTask",
-    #         "mergeDet": "The merged detections before deblending."
-    #     },
-    #     doc="The name of the input catalog.",
-    #     # TODO[DM-47797]: remove this config option and anything using it.
-    #     deprecated="Support for old deblender outputs will be removed after v29.",
-    # )
-    # doAddFootprints = Field(dtype=bool,
-    #                         default=True,
-    #                         doc="Whether or not to add footprints to the input catalog from scarlet models."
-    #                             "This should be true whenever using the multi-band deblender, "
-    #                             "otherwise this should be False.")
-    # doConserveFlux = 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.")
-    # doStripFootprints = Field(dtype=bool, default=True,
-    #                           doc="Whether to strip footprints from the output catalog before "
-    #                               "saving to disk. "
-    #                               "This is usually done when using scarlet models to save disk space.")
-    # measurement = ConfigurableField(target=SingleFrameMeasurementTask, doc="Source measurement")
-    # setPrimaryFlags = ConfigurableField(target=SetPrimaryFlagsTask, doc="Set flags for primary tract/patch")
-    # doPropagateFlags = Field(
-    #     dtype=bool, default=True,
-    #     doc="Whether to match sources to CCD catalogs to propagate flags (to e.g. identify PSF stars)"
-    # )
-    # propagateFlags = ConfigurableField(target=PropagateSourceFlagsTask, doc="Propagate source flags to
-    # coadd")
-    # doMatchSources = Field(
-    #     dtype=bool,
-    #     default=False,
-    #     doc="Match sources to reference catalog?",
-    #     deprecated="Reference matching in measureCoaddSources will be removed after v29.",
-    # )
-    # match = ConfigurableField(
-    #     target=DirectMatchTask,
-    #     doc="Matching to reference catalog",
-    #     deprecated="Reference matching in measureCoaddSources will be removed after v29.",
-    # )
-    # doWriteMatchesDenormalized = Field(
-    #     dtype=bool,
-    #     default=False,
-    #     doc=("Write reference matches in denormalized format? "
-    #          "This format uses more disk space, but is more convenient to read."),
-    #     deprecated="Reference matching in measureCoaddSources will be removed after v29.",
-    # )
     coaddName = Field(dtype=str, default="dcr", doc="Name of coadd")
-    # psfCache = Field(dtype=int, default=100, doc="Size of psfCache")
-    # checkUnitsParseStrict = Field(
-    #     doc="Strictness of Astropy unit compatibility check, can be 'raise', 'warn' or 'silent'",
-    #     dtype=str,
-    #     default="raise",
-    # )
-    # doApCorr = Field(
-    #     dtype=bool,
-    #     default=True,
-    #     doc="Apply aperture corrections"
-    # )
-    # applyApCorr = ConfigurableField(
-    #     target=ApplyApCorrTask,
-    #     doc="Subtask to apply aperture corrections"
-    # )
-    # doRunCatalogCalculation = Field(
-    #     dtype=bool,
-    #     default=True,
-    #     doc='Run catalogCalculation task'
-    # )
-    # catalogCalculation = ConfigurableField(
-    #     target=CatalogCalculationTask,
-    #     doc="Subtask to run catalogCalculation plugins on catalog"
-    # )
-
-    # hasFakes = Field(
-    #     dtype=bool,
-    #     default=False,
-    #     doc="Should be set to True if fake sources have been inserted into the input data."
-    # )
-    # idGenerator = SkyMapIdGeneratorConfig.make_field()
 
     @property
     def refObjLoader(self):
@@ -543,31 +382,6 @@ class DcrMeasureMergedCoaddSourcesTask(MeasureMergedCoaddSourcesTask):
     def __init__(self, schema=None, peakSchema=None, refObjLoader=None, initInputs=None,
                  **kwargs):
         super().__init__(schema, peakSchema, refObjLoader, initInputs, **kwargs)
-        # self.deblended = self.config.inputCatalog.startswith("deblended")
-        # self.inputCatalog = "Coadd_" + self.config.inputCatalog
-        # if initInputs is not None:
-        #     schema = initInputs['inputSchema'].schema
-        # if schema is None:
-        #     raise ValueError("Schema must be defined.")
-        # self.schemaMapper = afwTable.SchemaMapper(schema)
-        # self.schemaMapper.addMinimalSchema(schema)
-        # self.schema = self.schemaMapper.getOutputSchema()
-        # afwTable.CoordKey.addErrorFields(self.schema)
-        # self.algMetadata = PropertyList()
-        # self.makeSubtask("measurement", schema=self.schema, algMetadata=self.algMetadata)
-        # self.makeSubtask("setPrimaryFlags", schema=self.schema)
-        # # TODO[DM-47797]: remove match subtask
-        # if self.config.doMatchSources:
-        #     self.makeSubtask("match", refObjLoader=refObjLoader)
-        # if self.config.doPropagateFlags:
-        #     self.makeSubtask("propagateFlags", schema=self.schema)
-        # self.schema.checkUnits(parse_strict=self.config.checkUnitsParseStrict)
-        # if self.config.doApCorr:
-        #     self.makeSubtask("applyApCorr", schema=self.schema)
-        # if self.config.doRunCatalogCalculation:
-        #     self.makeSubtask("catalogCalculation", schema=self.schema)
-
-        # self.outputSchema = afwTable.SourceCatalog(self.schema)
 
     def runQuantum(self, butlerQC, inputRefs, outputRefs):
         inputs = butlerQC.get(inputRefs)