diff --git a/python/lsst/analysis/tools/tasks/astrometricCatalogMatch.py b/python/lsst/analysis/tools/tasks/astrometricCatalogMatch.py index 75465887d..f63d928f4 100644 --- a/python/lsst/analysis/tools/tasks/astrometricCatalogMatch.py +++ b/python/lsst/analysis/tools/tasks/astrometricCatalogMatch.py @@ -41,13 +41,13 @@ class AstrometricCatalogMatchConfig(CatalogMatchConfig, pipelineConnections=CatalogMatchConnections): bands = pexConfig.ListField[str]( doc="The bands to persist downstream", - default=["g", "r", "i", "z", "y"], + default=["u", "g", "r", "i", "z", "y"], ) def setDefaults(self): super().setDefaults() self.referenceCatalogLoader.doApplyColorTerms = False - self.referenceCatalogLoader.refObjLoader.requireProperMotion = False + self.referenceCatalogLoader.refObjLoader.requireProperMotion = True self.referenceCatalogLoader.refObjLoader.anyFilterMapsToThis = "phot_g_mean" diff --git a/python/lsst/analysis/tools/tasks/catalogMatch.py b/python/lsst/analysis/tools/tasks/catalogMatch.py index 902df0684..a5c4b4898 100644 --- a/python/lsst/analysis/tools/tasks/catalogMatch.py +++ b/python/lsst/analysis/tools/tasks/catalogMatch.py @@ -87,7 +87,7 @@ class CatalogMatchConfig(pipeBase.PipelineTaskConfig, pipelineConnections=Catalo filterNames = pexConfig.ListField[str]( doc="Physical filter names to persist downstream.", - default=["HSC-G", "HSC-R", "HSC-I", "HSC-Z", "HSC-Y"], + default=["u", "g", "r", "i", "z", "y"], ) selectorBands = pexConfig.ListField[str]( diff --git a/python/lsst/analysis/tools/tasks/photometricCatalogMatch.py b/python/lsst/analysis/tools/tasks/photometricCatalogMatch.py index 0784029d4..4cf0fcaef 100644 --- a/python/lsst/analysis/tools/tasks/photometricCatalogMatch.py +++ b/python/lsst/analysis/tools/tasks/photometricCatalogMatch.py @@ -40,10 +40,6 @@ class PhotometricCatalogMatchConnections(CatalogMatchConnections): class PhotometricCatalogMatchConfig( CatalogMatchConfig, pipelineConnections=PhotometricCatalogMatchConnections ): - filterNames = pexConfig.ListField[str]( - doc="Physical filter names to persist downstream.", - default=["HSC-G", "HSC-R2", "HSC-I2", "HSC-Z", "HSC-Y"], - ) def setDefaults(self): super().setDefaults()