Merge branch 'tickets/DM-30993'

lsst · Feb 17, 2025 · 6427438 · 6427438
2 parents e1eda53 + 1ac15d0
commit 6427438
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/config/comCam/calibrate.py b/config/comCam/calibrate.py
@@ -8,6 +8,17 @@
 config.astrometry.matcher.maxOffsetPix=1500
 config.astromRefObjLoader.pixelMargin=1500
 
+# Loosen minMatchDistanceArcSec, the match distance below which further
+# iteration is pointless (arcsec) since we can only do as well as the
+# camera model in SFM using the affine WCS fit.
+# TODO: DM-47250. Tighten up (or remove) this override when an updated
+# camera model is implemented.
+config.astrometry.minMatchDistanceArcSec = 0.04
+
+# Overrides to improved astrometry matching.
+config.astrometry.doFiducialZeroPointCull = True
+config.astrometry.load(os.path.join(obsConfigDir, "fiducialZeroPoint.py"))
+
 # Loosened for early ComCam with large PSFs.
 config.photoCal.match.sourceSelection.doUnresolved = False
 

diff --git a/config/comCam/calibrateImage.py b/config/comCam/calibrateImage.py
@@ -28,5 +28,16 @@
 config.astrometry.matcher.maxOffsetPix=1500
 config.astrometry_ref_loader.pixelMargin=1500
 
+# Loosen minMatchDistanceArcSec, the match distance below which further
+# iteration is pointless (arcsec) since we can only do as well as the
+# camera model in SFM using the affine WCS fit.
+# TODO: DM-47250. Tighten up (or remove) this override when an updated
+# camera model is implemented.
+config.astrometry.minMatchDistanceArcSec = 0.04
+
+# Overrides to improved astrometry matching.
+config.astrometry.doFiducialZeroPointCull = True
+config.astrometry.load(os.path.join(config_dir, "fiducialZeroPoint.py"))
+
 # Loosened for early ComCam with large PSFs.
 config.photometry.match.sourceSelection.doUnresolved = False