Skip to content

Commit

Permalink
Merge pull request #606 from lsst/tickets/DM-49118
Browse files Browse the repository at this point in the history
DM-49118: Update default refcats to the_monster_20250219.
  • Loading branch information
erykoff authored Feb 26, 2025
2 parents 83618dc + 528492a commit 26dc74c
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion config/analysisToolsPhotometricCatalogMatch.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.refCatalog = "the_monster_20250219"
2 changes: 1 addition & 1 deletion config/analysisToolsPhotometricCatalogMatchVisit.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.refCatalog = "the_monster_20250219"
4 changes: 2 additions & 2 deletions config/calibrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

# TODO: Turn color terms back on when they are available
config.photoCal.applyColorTerms = False
config.photoCal.photoCatName = "the_monster_20240904"
config.photoCal.photoCatName = "the_monster_20250219"

# Activate calibration of measurements: required for aperture corrections
config.measurement.load(os.path.join(obsConfigDir, "apertures.py"))
Expand All @@ -41,4 +41,4 @@
config.measurement.plugins["base_Jacobian"].pixelScale = 0.2

config.connections.astromRefCat = "gaia_dr3_20230707"
config.connections.photoRefCat = "the_monster_20240904"
config.connections.photoRefCat = "the_monster_20250219"
2 changes: 1 addition & 1 deletion config/comCam/analysisToolsAstrometricCatalogMatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.

config.connections.refCatalog = "the_monster_20240904"
config.connections.refCatalog = "the_monster_20250219"
2 changes: 1 addition & 1 deletion config/comCam/analysisToolsAstrometricCatalogMatchVisit.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.

config.connections.refCatalog = "the_monster_20240904"
config.connections.refCatalog = "the_monster_20250219"
2 changes: 1 addition & 1 deletion config/comCam/analysisToolsCatalogMatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.

config.connections.refCatalog = "the_monster_20240904"
config.connections.refCatalog = "the_monster_20250219"
2 changes: 1 addition & 1 deletion config/comCam/analysisToolsCatalogMatchVisit.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
# the GNU General Public License along with this program. If not,
# see <http://www.lsstcorp.org/LegalNotices/>.

config.connections.refCatalog = "the_monster_20240904"
config.connections.refCatalog = "the_monster_20250219"
2 changes: 1 addition & 1 deletion config/comCam/calibrate.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

obsConfigDir = os.path.join(os.path.dirname(__file__))
config.photoRefObjLoader.load(os.path.join(obsConfigDir, "filterMap.py"))
config.connections.astromRefCat = "the_monster_20240904"
config.connections.astromRefCat = "the_monster_20250219"

# Loosen maxOffset to account for early pointing model inaccuracy.
config.astrometry.matcher.maxOffsetPix=1500
Expand Down
12 changes: 6 additions & 6 deletions config/comCam/calibrateImage.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
# Configure the photometry to use atlas_refcat2.
config_dir = os.path.dirname(__file__)

config.connections.photometry_ref_cat = "the_monster_20240904"
config.connections.astrometry_ref_cat = "the_monster_20240904"
config.connections.photometry_ref_cat = "the_monster_20250219"
config.connections.astrometry_ref_cat = "the_monster_20250219"

config.photometry_ref_loader.load(os.path.join(config_dir, "filterMap.py"))

config.photometry.match.referenceSelection.magLimit.fluxField = "monster_SynthLSST_r_flux"
config.photometry.match.referenceSelection.magLimit.fluxField = "monster_ComCam_r_flux"
colors = config.photometry.match.referenceSelection.colorLimits
colors["g-r"] = ColorLimit(
primary="monster_SynthLSST_g_flux",
secondary="monster_SynthLSST_r_flux",
primary="monster_ComCam_g_flux",
secondary="monster_ComCam_r_flux",
minimum=0.4,
maximum=2.0
)

config.photometry.applyColorTerms = False
config.photometry.photoCatName = "the_monster_20240904"
config.photometry.photoCatName = "the_monster_20250219"

config.compute_summary_stats.load(os.path.join(config_dir, "computeExposureSummaryStats.py"))

Expand Down
6 changes: 3 additions & 3 deletions config/comCam/fgcmBuildFromIsolatedStars.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
config.coarseNside = 64

config.minPerBand = 2
config.connections.ref_cat = "the_monster_20240904"
config.connections.ref_cat = "the_monster_20250219"

configDir = os.path.join(os.path.dirname(__file__))
config.physicalFilterMap = physical_to_band
obsConfigDir = os.path.join(os.path.dirname(__file__))
config.fgcmLoadReferenceCatalog.load(os.path.join(obsConfigDir, "filterMap.py"))
config.fgcmLoadReferenceCatalog.applyColorTerms = False
config.fgcmLoadReferenceCatalog.referenceSelector.doSignalToNoise = True
config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.fluxField = "monster_SynthLSST_i_flux"
config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.errField = "monster_SynthLSST_i_fluxErr"
config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.fluxField = "monster_ComCam_i_flux"
config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.errField = "monster_ComCam_i_fluxErr"
config.fgcmLoadReferenceCatalog.referenceSelector.signalToNoise.minimum = 50.0
36 changes: 18 additions & 18 deletions config/comCam/filterMap.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
# switches between the two depending on whether color term corrections are
# enabled. Once that is fixed, this should be keyed by band as per RFC-976.
for source, target in [
("empty", "monster_SynthLSST_r"),
("white", "monster_SynthLSST_r"),
("u_02", "monster_SynthLSST_u"),
("u_05", "monster_SynthLSST_u"),
("u_06", "monster_SynthLSST_u"),
("g_01", "monster_SynthLSST_g"),
("g_07", "monster_SynthLSST_g"),
("r_03", "monster_SynthLSST_r"),
("i_06", "monster_SynthLSST_i"),
("z_02", "monster_SynthLSST_z"),
("z_03", "monster_SynthLSST_z"),
("y_04", "monster_SynthLSST_y"),
("u", "monster_SynthLSST_u"),
("g", "monster_SynthLSST_g"),
("r", "monster_SynthLSST_r"),
("i", "monster_SynthLSST_i"),
("z", "monster_SynthLSST_z"),
("y", "monster_SynthLSST_y"),
("empty", "monster_ComCam_r"),
("white", "monster_ComCam_r"),
("u_02", "monster_ComCam_u"),
("u_05", "monster_ComCam_u"),
("u_06", "monster_ComCam_u"),
("g_01", "monster_ComCam_g"),
("g_07", "monster_ComCam_g"),
("r_03", "monster_ComCam_r"),
("i_06", "monster_ComCam_i"),
("z_02", "monster_ComCam_z"),
("z_03", "monster_ComCam_z"),
("y_04", "monster_ComCam_y"),
("u", "monster_ComCam_u"),
("g", "monster_ComCam_g"),
("r", "monster_ComCam_r"),
("i", "monster_ComCam_i"),
("z", "monster_ComCam_z"),
("y", "monster_ComCam_y"),
]:
config.filterMap[source] = target
2 changes: 1 addition & 1 deletion config/comCam/gbdesAstrometricFit.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
config.connections.referenceCatalog = "the_monster_20240904"
config.connections.referenceCatalog = "the_monster_20250219"
2 changes: 1 addition & 1 deletion config/comCam/refCatObjectAnalysisTask.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.refCatalog = "the_monster_20250219"
4 changes: 2 additions & 2 deletions config/comCam/refCatObjectPhotometricAnalysisTask.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.outputName = "objectTable_tract_the_monster_20240904_match_photom"
config.connections.refCatalog = "the_monster_20250219"
config.connections.outputName = "objectTable_tract_the_monster_20250219_match_photom"
4 changes: 2 additions & 2 deletions config/comCam/refCatSourceAnalysisTask.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.outputName = "sourceTable_visit_the_monster_20240904_match_photom"
config.connections.refCatalog = "the_monster_20250219"
config.connections.outputName = "sourceTable_visit_the_monster_20250219_match_photom"
4 changes: 2 additions & 2 deletions config/comCam/refCatSourcePhotometricAnalysisTask.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.outputName = "sourceTable_visit_the_monster_20240904_match_photom"
config.connections.refCatalog = "the_monster_20250219"
config.connections.outputName = "sourceTable_visit_the_monster_20250219_match_photom"
6 changes: 3 additions & 3 deletions config/lsstCam/calibrateImage.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
config_dir = os.path.dirname(__file__)

config.photometry.applyColorTerms = False
config.photometry.photoCatName = "the_monster_20240904"
config.connections.photometry_ref_cat = "the_monster_20240904"
config.connections.astrometry_ref_cat = "the_monster_20240904"
config.photometry.photoCatName = "the_monster_20250219"
config.connections.photometry_ref_cat = "the_monster_20250219"
config.connections.astrometry_ref_cat = "the_monster_20250219"
config.photometry_ref_loader.load(os.path.join(config_dir, "filterMap.py"))
config.compute_summary_stats.load(os.path.join(config_dir, "computeExposureSummaryStats.py"))
4 changes: 2 additions & 2 deletions config/refCatObjectPhotometricAnalysisTask.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.outputName = "objectTable_tract_the_monster_20240904_match_photom"
config.connections.refCatalog = "the_monster_20250219"
config.connections.outputName = "objectTable_tract_the_monster_20250219_match_photom"
4 changes: 2 additions & 2 deletions config/refCatSourcePhotometricAnalysisTask.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
config.connections.refCatalog = "the_monster_20240904"
config.connections.outputName = "sourceTable_visit_the_monster_20240904_match_photom"
config.connections.refCatalog = "the_monster_20250219"
config.connections.outputName = "sourceTable_visit_the_monster_20250219_match_photom"

0 comments on commit 26dc74c

Please sign in to comment.