From 2b8739cb62b5efda9526aaf53b86c88a936b885c Mon Sep 17 00:00:00 2001 From: Jim Bosch Date: Mon, 4 Nov 2024 11:53:29 -0500 Subject: [PATCH 1/2] Switch LSSTCam/calibrateImage to The Monster. It'd be nice to remove some duplication by moving some of these overrides from config/lsstCam/ down to config/, but the refcat overrides for the simulated instruments are so scattershot right now (some are here, some are in drp_pipe) that this would need a lot of care and attention to detail. --- config/lsstCam/calibrateImage.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/config/lsstCam/calibrateImage.py b/config/lsstCam/calibrateImage.py index 199db0b10..45f1e7d83 100644 --- a/config/lsstCam/calibrateImage.py +++ b/config/lsstCam/calibrateImage.py @@ -1,18 +1,10 @@ import os.path -from lsst.meas.algorithms import ColorLimit # Configure the photometry to use atlas_refcat2. config_dir = os.path.dirname(__file__) -config.connections.photometry_ref_cat = "atlas_refcat2_20220201" -config.photometry_ref_loader.load(os.path.join(config_dir, "filterMap.py")) - -config.photometry.match.referenceSelection.magLimit.fluxField = "r_flux" -colors = config.photometry.match.referenceSelection.colorLimits -colors["g-r"] = ColorLimit(primary="g_flux", secondary="r_flux", minimum=0.4, maximum=2.0) - -# TODO: Turn color terms back on when they are available config.photometry.applyColorTerms = False -config.photometry.photoCatName = "atlas_refcat2_20220201" -config.photometry.colorterms.load(os.path.join(config_dir, "colorterms.py")) - +config.photometry.photoCatName = "the_monster_20240904" +config.connections.photometry_ref_cat = "the_monster_20240904" +config.connections.astrometry_ref_cat = "the_monster_20240904" +config.photometry_ref_loader.load(os.path.join(config_dir, "filterMap.py")) config.compute_summary_stats.load(os.path.join(config_dir, "computeExposureSummaryStats.py")) From eaaa5e0bcf5883e28fe2ecfc4d2bb6de8578e80a Mon Sep 17 00:00:00 2001 From: Jim Bosch Date: Mon, 4 Nov 2024 12:33:19 -0500 Subject: [PATCH 2/2] Switch LSSTComCam/calibrateImage to The Monster for astrometry. --- config/comCam/calibrateImage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/comCam/calibrateImage.py b/config/comCam/calibrateImage.py index d8fd641a0..4cf0872ab 100644 --- a/config/comCam/calibrateImage.py +++ b/config/comCam/calibrateImage.py @@ -6,6 +6,8 @@ config_dir = os.path.dirname(__file__) config.connections.photometry_ref_cat = "the_monster_20240904" +config.connections.astrometry_ref_cat = "the_monster_20240904" + config.photometry_ref_loader.load(os.path.join(config_dir, "filterMap.py")) config.photometry.match.referenceSelection.magLimit.fluxField = "monster_SynthLSST_r_flux" @@ -17,7 +19,6 @@ maximum=2.0 ) - config.photometry.applyColorTerms = False config.photometry.photoCatName = "the_monster_20240904"