Switch to a single, standard dataset type name for all skymap inputs.

lsst · Nov 13, 2020 · 08c36d7 · 08c36d7
1 parent 823733c
commit 08c36d7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/python/lsst/pipe/tasks/assembleCoadd.py b/python/lsst/pipe/tasks/assembleCoadd.py
@@ -37,6 +37,7 @@
 import lsst.log as log
 import lsstDebug
 import lsst.utils as utils
+from lsst.skymap import BaseSkyMap
 from .coaddBase import CoaddBaseTask, SelectDataIdContainer, makeSkyInfo, makeCoaddSuffix
 from .interpImage import InterpImageTask
 from .scaleZeroPoint import ScaleZeroPointTask
@@ -69,7 +70,7 @@ class AssembleCoaddConnections(pipeBase.PipelineTaskConnections,
     )
     skyMap = pipeBase.connectionTypes.Input(
         doc="Input definition of geometry/bbox and projection/wcs for coadded exposures",
-        name="{inputCoaddName}Coadd_skyMap",
+        name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
         storageClass="SkyMap",
         dimensions=("skymap", ),
     )

diff --git a/python/lsst/pipe/tasks/dcrAssembleCoadd.py b/python/lsst/pipe/tasks/dcrAssembleCoadd.py
@@ -34,6 +34,7 @@
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 import lsst.utils as utils
+from lsst.skymap import BaseSkyMap
 from .assembleCoadd import (AssembleCoaddTask,
                             CompareWarpAssembleCoaddConfig,
                             CompareWarpAssembleCoaddTask)
@@ -61,7 +62,7 @@ class DcrAssembleCoaddConnections(pipeBase.PipelineTaskConnections,
     )
     skyMap = pipeBase.connectionTypes.Input(
         doc="Input definition of geometry/bbox and projection/wcs for coadded exposures",
-        name="{inputCoaddName}Coadd_skyMap",
+        name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
         storageClass="SkyMap",
         dimensions=("skymap", ),
     )

diff --git a/python/lsst/pipe/tasks/imageDifference.py b/python/lsst/pipe/tasks/imageDifference.py
@@ -43,6 +43,7 @@
 import lsst.ip.diffim.diffimTools as diffimTools
 import lsst.ip.diffim.utils as diUtils
 import lsst.afw.display as afwDisplay
+from lsst.skymap import BaseSkyMap
 
 __all__ = ["ImageDifferenceConfig", "ImageDifferenceTask"]
 FwhmPerSigma = 2*math.sqrt(2*math.log(2))
@@ -73,7 +74,7 @@ class ImageDifferenceTaskConnections(pipeBase.PipelineTaskConnections,
 
     skyMap = pipeBase.connectionTypes.Input(
         doc="Input definition of geometry/bbox and projection/wcs for template exposures",
-        name="{skyMapName}Coadd_skyMap",
+        name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
         dimensions=("skymap", ),
         storageClass="SkyMap",
     )

diff --git a/python/lsst/pipe/tasks/makeCoaddTempExp.py b/python/lsst/pipe/tasks/makeCoaddTempExp.py
@@ -30,6 +30,7 @@
 import lsst.log as log
 import lsst.utils as utils
 from lsst.meas.algorithms import CoaddPsf, CoaddPsfConfig
+from lsst.skymap import BaseSkyMap
 from .coaddBase import CoaddBaseTask, makeSkyInfo
 from .warpAndPsfMatch import WarpAndPsfMatchTask
 from .coaddHelpers import groupPatchExposures, getGroupDataRef
@@ -596,7 +597,7 @@ class MakeWarpConnections(pipeBase.PipelineTaskConnections,
     )
     skyMap = cT.Input(
         doc="Input definition of geometry/bbox and projection/wcs for warped exposures",
-        name="{coaddName}Coadd_skyMap",
+        name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
         storageClass="SkyMap",
         dimensions=("skymap",),
     )

diff --git a/python/lsst/pipe/tasks/mergeDetections.py b/python/lsst/pipe/tasks/mergeDetections.py
@@ -30,6 +30,7 @@
 import lsst.afw.table as afwTable
 
 from lsst.meas.algorithms import SkyObjectsTask
+from lsst.skymap import BaseSkyMap
 from lsst.pex.config import Config, Field, ListField, ConfigurableField, ConfigField
 from lsst.pipe.base import (CmdLineTask, PipelineTask, PipelineTaskConfig, Struct,
                             PipelineTaskConnections)
@@ -68,7 +69,7 @@ class MergeDetectionsConnections(PipelineTaskConnections,
 
     skyMap = cT.Input(
         doc="SkyMap to be used in merging",
-        name="{inputCoaddName}Coadd_skyMap",
+        name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
         storageClass="SkyMap",
         dimensions=("skymap",),
     )

diff --git a/python/lsst/pipe/tasks/multiBand.py b/python/lsst/pipe/tasks/multiBand.py
@@ -39,6 +39,7 @@
 import lsst.afw.table as afwTable
 import lsst.afw.math as afwMath
 from lsst.daf.base import PropertyList
+from lsst.skymap import BaseSkyMap
 
 from .mergeDetections import MergeDetectionsConfig, MergeDetectionsTask  # noqa: F401
 from .mergeMeasurements import MergeMeasurementsConfig, MergeMeasurementsTask  # noqa: F401
@@ -614,7 +615,7 @@ class MeasureMergedCoaddSourcesConnections(PipelineTaskConnections,
     )
     skyMap = cT.Input(
         doc="SkyMap to use in processing",
-        name="{inputCoaddName}Coadd_skyMap",
+        name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
         storageClass="SkyMap",
         dimensions=("skymap",),
     )