diff --git a/config/analysisToolsPhotometricCatalogMatch.py b/config/analysisToolsPhotometricCatalogMatch.py new file mode 100644 index 000000000..7f59aab80 --- /dev/null +++ b/config/analysisToolsPhotometricCatalogMatch.py @@ -0,0 +1 @@ +config.connections.refCatalog = "the_monster_20240904" diff --git a/config/analysisToolsPhotometricCatalogMatchVisit.py b/config/analysisToolsPhotometricCatalogMatchVisit.py new file mode 100644 index 000000000..7f59aab80 --- /dev/null +++ b/config/analysisToolsPhotometricCatalogMatchVisit.py @@ -0,0 +1 @@ +config.connections.refCatalog = "the_monster_20240904" diff --git a/config/comCam/analysisToolsAstrometricCatalogMatch.py b/config/comCam/analysisToolsAstrometricCatalogMatch.py new file mode 100644 index 000000000..764a1f5cf --- /dev/null +++ b/config/comCam/analysisToolsAstrometricCatalogMatch.py @@ -0,0 +1,23 @@ +# This file is part of obs_lsst. +# +# Developed for the LSST Data Management System. +# This product includes software developed by the LSST Project +# (http://www.lsst.org). +# See the COPYRIGHT file at the top-level directory of this distribution +# for details of code ownership. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the LSST License Statement and +# the GNU General Public License along with this program. If not, +# see . + +config.connections.refCatalog = "the_monster_20240904" diff --git a/config/comCam/analysisToolsAstrometricCatalogMatchVisit.py b/config/comCam/analysisToolsAstrometricCatalogMatchVisit.py new file mode 100644 index 000000000..764a1f5cf --- /dev/null +++ b/config/comCam/analysisToolsAstrometricCatalogMatchVisit.py @@ -0,0 +1,23 @@ +# This file is part of obs_lsst. +# +# Developed for the LSST Data Management System. +# This product includes software developed by the LSST Project +# (http://www.lsst.org). +# See the COPYRIGHT file at the top-level directory of this distribution +# for details of code ownership. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the LSST License Statement and +# the GNU General Public License along with this program. If not, +# see . + +config.connections.refCatalog = "the_monster_20240904" diff --git a/config/comCam/analysisToolsCatalogMatch.py b/config/comCam/analysisToolsCatalogMatch.py new file mode 100644 index 000000000..764a1f5cf --- /dev/null +++ b/config/comCam/analysisToolsCatalogMatch.py @@ -0,0 +1,23 @@ +# This file is part of obs_lsst. +# +# Developed for the LSST Data Management System. +# This product includes software developed by the LSST Project +# (http://www.lsst.org). +# See the COPYRIGHT file at the top-level directory of this distribution +# for details of code ownership. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the LSST License Statement and +# the GNU General Public License along with this program. If not, +# see . + +config.connections.refCatalog = "the_monster_20240904" diff --git a/config/comCam/analysisToolsCatalogMatchVisit.py b/config/comCam/analysisToolsCatalogMatchVisit.py new file mode 100644 index 000000000..764a1f5cf --- /dev/null +++ b/config/comCam/analysisToolsCatalogMatchVisit.py @@ -0,0 +1,23 @@ +# This file is part of obs_lsst. +# +# Developed for the LSST Data Management System. +# This product includes software developed by the LSST Project +# (http://www.lsst.org). +# See the COPYRIGHT file at the top-level directory of this distribution +# for details of code ownership. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the LSST License Statement and +# the GNU General Public License along with this program. If not, +# see . + +config.connections.refCatalog = "the_monster_20240904" diff --git a/config/comCam/analysisToolsPhotometricCatalogMatch.py b/config/comCam/analysisToolsPhotometricCatalogMatch.py index a73d19032..d5f3b3d58 100644 --- a/config/comCam/analysisToolsPhotometricCatalogMatch.py +++ b/config/comCam/analysisToolsPhotometricCatalogMatch.py @@ -1,9 +1,5 @@ -"""Overrides for PhotometricCatalogMatchTask""" - import os.path configDir = os.path.dirname(__file__) config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) config.referenceCatalogLoader.doApplyColorTerms = False - -config.connections.refCatalog = "the_monster_20240904" diff --git a/config/comCam/analysisToolsPhotometricCatalogMatchVisit.py b/config/comCam/analysisToolsPhotometricCatalogMatchVisit.py index f878b61b3..d5f3b3d58 100644 --- a/config/comCam/analysisToolsPhotometricCatalogMatchVisit.py +++ b/config/comCam/analysisToolsPhotometricCatalogMatchVisit.py @@ -1,9 +1,5 @@ -"""Overrides for PhotometricCatalogMatchTask""" - import os.path configDir = os.path.dirname(__file__) config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) - -config.connections.refCatalog = "the_monster_20240904" config.referenceCatalogLoader.doApplyColorTerms = False diff --git a/config/comCam/calibrate.py b/config/comCam/calibrate.py index 43763793b..f50f5c0e4 100644 --- a/config/comCam/calibrate.py +++ b/config/comCam/calibrate.py @@ -2,3 +2,4 @@ obsConfigDir = os.path.join(os.path.dirname(__file__)) config.photoRefObjLoader.load(os.path.join(obsConfigDir, "filterMap.py")) +config.connections.astromRefCat = "the_monster_20240904" diff --git a/config/comCam/measureCoaddSources.py b/config/comCam/measureCoaddSources.py index dd59f45a8..c21bd20a8 100644 --- a/config/comCam/measureCoaddSources.py +++ b/config/comCam/measureCoaddSources.py @@ -1,6 +1,3 @@ -"""comCam-specific overrides for MeasureMergedCoaddSourcesTask""" - import os.path config.match.refObjLoader.load(os.path.join(os.path.dirname(__file__), "filterMap.py")) -config.connections.refCat = "the_monster_20240904" diff --git a/config/comCam/refCatObjectAnalysisTask.py b/config/comCam/refCatObjectAnalysisTask.py new file mode 100644 index 000000000..7f59aab80 --- /dev/null +++ b/config/comCam/refCatObjectAnalysisTask.py @@ -0,0 +1 @@ +config.connections.refCatalog = "the_monster_20240904" diff --git a/config/comCam/refCatObjectPhotometricAnalysisTask.py b/config/comCam/refCatObjectPhotometricAnalysisTask.py new file mode 100644 index 000000000..ec5d5d4fd --- /dev/null +++ b/config/comCam/refCatObjectPhotometricAnalysisTask.py @@ -0,0 +1,2 @@ +config.connections.refCatalog = "the_monster_20240904" +config.connections.outputName = "objectTable_tract_the_monster_20240904_match_photom" diff --git a/config/comCam/refCatSourceAnalysisTask.py b/config/comCam/refCatSourceAnalysisTask.py new file mode 100644 index 000000000..02dc9b266 --- /dev/null +++ b/config/comCam/refCatSourceAnalysisTask.py @@ -0,0 +1,2 @@ +config.connections.refCatalog = "the_monster_20240904" +config.connections.outputName = "sourceTable_visit_the_monster_20240904_match_photom" diff --git a/config/comCam/refCatSourcePhotometricAnalysisTask.py b/config/comCam/refCatSourcePhotometricAnalysisTask.py new file mode 100644 index 000000000..02dc9b266 --- /dev/null +++ b/config/comCam/refCatSourcePhotometricAnalysisTask.py @@ -0,0 +1,2 @@ +config.connections.refCatalog = "the_monster_20240904" +config.connections.outputName = "sourceTable_visit_the_monster_20240904_match_photom" diff --git a/config/comCamSim/analysisToolsPhotometricCatalogMatch.py b/config/comCamSim/analysisToolsPhotometricCatalogMatch.py index 4acbc5a62..52ff0d9c1 100644 --- a/config/comCamSim/analysisToolsPhotometricCatalogMatch.py +++ b/config/comCamSim/analysisToolsPhotometricCatalogMatch.py @@ -1,5 +1,3 @@ -"""comCamSim-specific overrides for PhotometricCatalogMatchTask""" - import os.path configDir = os.path.dirname(__file__) @@ -7,5 +5,4 @@ config.referenceCatalogLoader.doApplyColorTerms = False config.connections.refCatalog = "uw_stars_20240524" -config.connections.matchedCatalog = "objectTable_tract_uw_stars_20240524_photoMatch" config.filterNames = ("g", "r", "i") diff --git a/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py b/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py index fb1f1820a..6f223cbf2 100644 --- a/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py +++ b/config/comCamSim/analysisToolsPhotometricCatalogMatchVisit.py @@ -1,9 +1,7 @@ -"""comCamSim-specific overrides for PhotometricCatalogMatchVisitTask""" - import os.path configDir = os.path.dirname(__file__) config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) +config.referenceCatalogLoader.doApplyColorTerms = False config.connections.refCatalog = "uw_stars_20240524" -config.referenceCatalogLoader.doApplyColorTerms = False diff --git a/config/comCamSim/measureCoaddSources.py b/config/comCamSim/measureCoaddSources.py index 77b9b612d..7760ef7ea 100644 --- a/config/comCamSim/measureCoaddSources.py +++ b/config/comCamSim/measureCoaddSources.py @@ -1,5 +1,3 @@ -"""comCamSim-specific overrides for MeasureMergedCoaddSourcesTask""" - import os.path config.match.refObjLoader.load(os.path.join(os.path.dirname(__file__), "filterMap.py")) diff --git a/config/comCamSim/refCatObjectPhotometricAnalysisTask.py b/config/comCamSim/refCatObjectPhotometricAnalysisTask.py index 4c2f01581..911fee635 100644 --- a/config/comCamSim/refCatObjectPhotometricAnalysisTask.py +++ b/config/comCamSim/refCatObjectPhotometricAnalysisTask.py @@ -1,4 +1,2 @@ -"""Overrides for RefCatObjectPhotometricAnalysisTask""" - -config.connections.outputName = "objectTable_tract_uw_stars_20240524_match_photom" config.connections.refCatalog = "uw_stars_20240524" +config.connections.outputName = "objectTable_tract_uw_stars_20240524_match_photom" diff --git a/config/comCamSim/refCatSourcePhotometricAnalysisTask.py b/config/comCamSim/refCatSourcePhotometricAnalysisTask.py index f70d06723..82ea1e857 100644 --- a/config/comCamSim/refCatSourcePhotometricAnalysisTask.py +++ b/config/comCamSim/refCatSourcePhotometricAnalysisTask.py @@ -1,3 +1,2 @@ -"""comCamSim-specific overrides for RefCatSourcePhotometricAnalysisTask""" - -config.connections.data = "sourceTable_visit_uw_stars_20240524_photoMatch" +config.connections.refCatalog = "uw_stars_20240524" +config.connections.outputName = "sourceTable_visit_uw_stars_20240524_match_photom" diff --git a/config/imsim/analysisToolsPhotometricCatalogMatch.py b/config/imsim/analysisToolsPhotometricCatalogMatch.py index 7cc1ca5a8..109c4190d 100644 --- a/config/imsim/analysisToolsPhotometricCatalogMatch.py +++ b/config/imsim/analysisToolsPhotometricCatalogMatch.py @@ -2,5 +2,5 @@ configDir = os.path.dirname(__file__) config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) - config.referenceCatalogLoader.doApplyColorTerms = False +config.connections.refCatalog = "cal_ref_cat_2_2" diff --git a/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py b/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py index 7cc1ca5a8..109c4190d 100644 --- a/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py +++ b/config/imsim/analysisToolsPhotometricCatalogMatchVisit.py @@ -2,5 +2,5 @@ configDir = os.path.dirname(__file__) config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) - config.referenceCatalogLoader.doApplyColorTerms = False +config.connections.refCatalog = "cal_ref_cat_2_2" diff --git a/config/imsim/measureCoaddSources.py b/config/imsim/measureCoaddSources.py index ea725e49d..51c80820c 100644 --- a/config/imsim/measureCoaddSources.py +++ b/config/imsim/measureCoaddSources.py @@ -1,28 +1,4 @@ -# This file is part of obs_lsst. -# -# Developed for the LSST Data Management System. -# This product includes software developed by the LSST Project -# (http://www.lsst.org). -# See the COPYRIGHT file at the top-level directory of this distribution -# for details of code ownership. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the LSST License Statement and -# the GNU General Public License along with this program. If not, -# see . - -"""imSim-specific overrides for MeasureMergedCoaddSourcesTask""" - import os.path config.match.refObjLoader.load(os.path.join(os.path.dirname(__file__), "filterMap.py")) -config.connections.refCat = "cal_ref_cat" +config.connections.refCat = "cal_ref_cat_2_2" diff --git a/config/imsim/refCatObjectPhotometricAnalysisTask.py b/config/imsim/refCatObjectPhotometricAnalysisTask.py new file mode 100644 index 000000000..d907f4202 --- /dev/null +++ b/config/imsim/refCatObjectPhotometricAnalysisTask.py @@ -0,0 +1,2 @@ +config.connections.refCatalog = "cal_ref_cat_2_2" +config.connections.outputName = "objectTable_tract_cal_ref_cat_2_2_match_photom" diff --git a/config/imsim/refCatSourcePhotometricAnalysisTask.py b/config/imsim/refCatSourcePhotometricAnalysisTask.py new file mode 100644 index 000000000..0499df2a2 --- /dev/null +++ b/config/imsim/refCatSourcePhotometricAnalysisTask.py @@ -0,0 +1,2 @@ +config.connections.refCatalog = "cal_ref_cat_2_2" +config.connections.outputName = "sourceTable_visit_cal_ref_cat_2_2_match_photom" diff --git a/config/latiss/analysisToolsPhotometricCatalogMatch.py b/config/latiss/analysisToolsPhotometricCatalogMatch.py index a376c3a12..9a3168698 100644 --- a/config/latiss/analysisToolsPhotometricCatalogMatch.py +++ b/config/latiss/analysisToolsPhotometricCatalogMatch.py @@ -6,6 +6,7 @@ config.referenceCatalogLoader.doApplyColorTerms = True config.referenceCatalogLoader.colorterms.load(os.path.join(OBS_CONFIG_DIR, "colorterms.py")) +config.connections.refCatalog = "atlas_refcat2_20220201" config.filterNames = ["SDSSg_65mm~empty", "SDSSr_65mm~empty", "SDSSi_65mm~empty", diff --git a/config/latiss/analysisToolsPhotometricCatalogMatchVisit.py b/config/latiss/analysisToolsPhotometricCatalogMatchVisit.py new file mode 100644 index 000000000..1ac7543d9 --- /dev/null +++ b/config/latiss/analysisToolsPhotometricCatalogMatchVisit.py @@ -0,0 +1,9 @@ +import os.path + +OBS_CONFIG_DIR = os.path.dirname(__file__) + +config.referenceCatalogLoader.refObjLoader.load(os.path.join(OBS_CONFIG_DIR, "filterMap.py")) +config.referenceCatalogLoader.doApplyColorTerms = True +config.referenceCatalogLoader.colorterms.load(os.path.join(OBS_CONFIG_DIR, "colorterms.py")) + +config.connections.refCatalog = "atlas_refcat2_20220201" diff --git a/config/latiss/refCatObjectPhotometricAnalysisTask.py b/config/latiss/refCatObjectPhotometricAnalysisTask.py index 3bf70cae4..b5638f8a0 100644 --- a/config/latiss/refCatObjectPhotometricAnalysisTask.py +++ b/config/latiss/refCatObjectPhotometricAnalysisTask.py @@ -6,5 +6,5 @@ objectConfig.load(os.path.join(os.path.dirname(__file__), "transformObjectCatalog.py")) config.bands = objectConfig.outputBands -config.connections.refCatalog = "the_monster_20240904" -config.connections.outputName = "objectTable_tract_the_monster_20240904_match_photom" +config.connections.refCatalog = "atlas_refcat2_20220201" +config.connections.outputName = "objectTable_tract_atlas_refcat2_20220201_match_photom" diff --git a/config/latiss/refCatSourcePhotometricAnalysisTask.py b/config/latiss/refCatSourcePhotometricAnalysisTask.py new file mode 100644 index 000000000..d4e6946b8 --- /dev/null +++ b/config/latiss/refCatSourcePhotometricAnalysisTask.py @@ -0,0 +1,10 @@ +import os.path +from lsst.pipe.tasks.postprocess import TransformObjectCatalogConfig + +# By default loop over all the same bands that are present in the Object Table +objectConfig = TransformObjectCatalogConfig() +objectConfig.load(os.path.join(os.path.dirname(__file__), "transformObjectCatalog.py")) +config.bands = objectConfig.outputBands + +config.connections.refCatalog = "atlas_refcat2_20220201" +config.connections.outputName = "sourceTable_visit_atlas_refcat2_20220201_match_photom" diff --git a/config/lsstCam/analysisToolsPhotometricCatalogMatch.py b/config/lsstCam/analysisToolsPhotometricCatalogMatch.py index 89c3aa46c..7c5e59389 100644 --- a/config/lsstCam/analysisToolsPhotometricCatalogMatch.py +++ b/config/lsstCam/analysisToolsPhotometricCatalogMatch.py @@ -5,5 +5,3 @@ configDir = os.path.dirname(__file__) config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) config.referenceCatalogLoader.doApplyColorTerms = False - -config.connections.refCatalog = "atlas_refcat2_20220201" diff --git a/config/lsstCam/analysisToolsPhotometricCatalogMatchVisit.py b/config/lsstCam/analysisToolsPhotometricCatalogMatchVisit.py index 20be187a0..7c5e59389 100644 --- a/config/lsstCam/analysisToolsPhotometricCatalogMatchVisit.py +++ b/config/lsstCam/analysisToolsPhotometricCatalogMatchVisit.py @@ -4,6 +4,4 @@ configDir = os.path.dirname(__file__) config.referenceCatalogLoader.refObjLoader.load(os.path.join(configDir, "filterMap.py")) - -config.connections.refCatalog = "atlas_refcat2_20220201" config.referenceCatalogLoader.doApplyColorTerms = False diff --git a/config/lsstCam/measureCoaddSources.py b/config/lsstCam/measureCoaddSources.py index 36ea39926..c21bd20a8 100644 --- a/config/lsstCam/measureCoaddSources.py +++ b/config/lsstCam/measureCoaddSources.py @@ -1,6 +1,3 @@ -"""LSSTCam-specific overrides for MeasureMergedCoaddSourcesTask""" - import os.path config.match.refObjLoader.load(os.path.join(os.path.dirname(__file__), "filterMap.py")) -config.connections.refCat = "atlas_refcat2_20220201" diff --git a/config/measureCoaddSources.py b/config/measureCoaddSources.py index 7d2f77730..f2f1fb6d9 100644 --- a/config/measureCoaddSources.py +++ b/config/measureCoaddSources.py @@ -29,5 +29,5 @@ config.load(os.path.join(os.path.dirname(__file__), "cmodel.py")) config.doWriteMatchesDenormalized = True - +config.connections.refCat = "the_monster_20240904" config.measurement.plugins.names |= ["base_InputCount"] diff --git a/config/refCatObjectPhotometricAnalysisTask.py b/config/refCatObjectPhotometricAnalysisTask.py new file mode 100644 index 000000000..ec5d5d4fd --- /dev/null +++ b/config/refCatObjectPhotometricAnalysisTask.py @@ -0,0 +1,2 @@ +config.connections.refCatalog = "the_monster_20240904" +config.connections.outputName = "objectTable_tract_the_monster_20240904_match_photom" diff --git a/config/refCatSourcePhotometricAnalysisTask.py b/config/refCatSourcePhotometricAnalysisTask.py index b19d63af0..02dc9b266 100644 --- a/config/refCatSourcePhotometricAnalysisTask.py +++ b/config/refCatSourcePhotometricAnalysisTask.py @@ -1,4 +1,2 @@ -"""Overrides for RefCatSourcePhotometricAnalysisTask""" - -config.connections.data = "sourceTable_visit_the_monster_20240904_match_photom" +config.connections.refCatalog = "the_monster_20240904" config.connections.outputName = "sourceTable_visit_the_monster_20240904_match_photom"