From 72f1459791c108b8096de192f9d66c94bf10cfbe Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Sun, 27 Oct 2024 08:30:20 -0700
Subject: [PATCH] Update astrom/photoCal for early ComCam data.

---
 config/comCam/calibrate.py      |  7 +++++++
 config/comCam/calibrateImage.py |  7 +++++++
 config/comCam/filterMap.py      | 16 +++++++++++++---
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/config/comCam/calibrate.py b/config/comCam/calibrate.py
index f50f5c0e4..777f106e8 100644
--- a/config/comCam/calibrate.py
+++ b/config/comCam/calibrate.py
@@ -3,3 +3,10 @@
 obsConfigDir = os.path.join(os.path.dirname(__file__))
 config.photoRefObjLoader.load(os.path.join(obsConfigDir, "filterMap.py"))
 config.connections.astromRefCat = "the_monster_20240904"
+
+# Loosen maxOffset to account for early pointing model inaccuracy.
+config.astrometry.matcher.maxOffsetPix=800
+config.astromRefObjLoader.pixelMargin=800
+
+# 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
index 84e8baf34..4c115a8f6 100644
--- a/config/comCam/calibrateImage.py
+++ b/config/comCam/calibrateImage.py
@@ -22,3 +22,10 @@
 config.photometry.photoCatName = "the_monster_20240904"
 
 config.compute_summary_stats.load(os.path.join(config_dir, "computeExposureSummaryStats.py"))
+
+# Loosen maxOffset to account for early pointing model inaccuracy.
+config.astrometry.matcher.maxOffsetPix=800
+config.astrometry_ref_loader.pixelMargin=800
+
+# Loosened for early ComCam with large PSFs.
+config.photometry.match.sourceSelection.doUnresolved = False
diff --git a/config/comCam/filterMap.py b/config/comCam/filterMap.py
index 93b52f9a9..642052fc9 100644
--- a/config/comCam/filterMap.py
+++ b/config/comCam/filterMap.py
@@ -1,9 +1,13 @@
-# Mapping of camera filter name: reference catalog filter name
+# Mapping of camera band to reference catalog filter name
 # This file is appropriate for the_monster
 
+
+# This includes mappings for both filter and band, because photoCalTask
+# 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 [
-    # update left hand column with the filter names once we know them
-    ("empty", "white"),
+    ("empty", "monster_SynthLSST_r"),
+    ("white", "monster_SynthLSST_r"),
     ("u_02", "monster_SynthLSST_u"),
     ("u_05", "monster_SynthLSST_u"),
     ("u_06", "monster_SynthLSST_u"),
@@ -14,5 +18,11 @@
     ("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"),
 ]:
     config.filterMap[source] = target