Switch to calibrateImage outputs

mag/magErr are now in the calibrated catalogs
lsst · Aug 21, 2024 · 0d728c9 · 0d728c9
1 parent 71a520a
commit 0d728c9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/python/lsst/faro/base/MatchedCatalogBase.py b/python/lsst/faro/base/MatchedCatalogBase.py
@@ -45,7 +45,7 @@ class MatchedBaseConnections(
         doc="Source catalogs to match up.",
         dimensions=("instrument", "visit", "detector", "band"),
         storageClass="SourceCatalog",
-        name="src",
+        name="initial_stars_footprints_detector",
         multiple=True,
     )
     visitSummary = pipeBase.connectionTypes.Input(

diff --git a/python/lsst/faro/measurement/DetectorMeasurement.py b/python/lsst/faro/measurement/DetectorMeasurement.py
@@ -39,7 +39,7 @@ class DetectorMeasurementConnections(
         doc="Source catalog.",
         dimensions=("instrument", "visit", "detector", "band"),
         storageClass="SourceCatalog",
-        name="src",
+        name="initial_stars_footprints_detector",
     )
     visitSummary = pipeBase.connectionTypes.Input(
         doc="Exposure catalog with WCS and PhotoCalib this detector+visit combination.",

diff --git a/python/lsst/faro/measurement/VisitMeasurement.py b/python/lsst/faro/measurement/VisitMeasurement.py
@@ -42,14 +42,14 @@
 class VisitMeasurementConnections(
     CatalogMeasurementBaseConnections,
     dimensions=("instrument", "visit", "band"),
-    defaultTemplates={"photoCalibName": "calexp.photoCalib", "wcsName": "calexp.wcs"},
+    defaultTemplates={"photoCalibName": "initial_pvi.photoCalib", "wcsName": "initial_pvi.wcs"},
 ):
 
     catalogs = pipeBase.connectionTypes.Input(
         doc="Source catalogs.",
         dimensions=("instrument", "visit", "detector", "band"),
         storageClass="SourceCatalog",
-        name="src",
+        name="initial_stars_footprints_detector",
         multiple=True,
     )
 

diff --git a/python/lsst/faro/utils/matcher.py b/python/lsst/faro/utils/matcher.py
@@ -58,10 +58,11 @@ def matchCatalogs(
     mapper = SchemaMapper(schema)
     mapper.addMinimalSchema(schema)
     mapper.addOutputField(Field[float]("base_PsfFlux_snr", "PSF flux SNR"))
-    mapper.addOutputField(Field[float]("base_PsfFlux_mag", "PSF magnitude"))
-    mapper.addOutputField(
-        Field[float]("base_PsfFlux_magErr", "PSF magnitude uncertainty")
-    )
+    if "base_PsfFlux_mag" not in schema:
+        mapper.addOutputField(Field[float]("base_PsfFlux_mag", "PSF magnitude"))
+        mapper.addOutputField(
+            Field[float]("base_PsfFlux_magErr", "PSF magnitude uncertainty")
+        )
     # Needed because addOutputField(... 'slot_ModelFlux_mag') will add a field with that literal name
     aliasMap = schema.getAliasMap()
     # Possibly not needed since base_GaussianFlux is the default, but this ought to be safe
@@ -70,10 +71,11 @@ def matchCatalogs(
         if "slot_ModelFlux" in aliasMap.keys()
         else "base_GaussianFlux"
     )
-    mapper.addOutputField(Field[float](f"{modelName}_mag", "Model magnitude"))
-    mapper.addOutputField(
-        Field[float](f"{modelName}_magErr", "Model magnitude uncertainty")
-    )
+    if f"{modelName}_mag" not in schema:
+        mapper.addOutputField(Field[float](f"{modelName}_mag", "Model magnitude"))
+        mapper.addOutputField(
+            Field[float](f"{modelName}_magErr", "Model magnitude uncertainty")
+        )
     mapper.addOutputField(Field[float](f"{modelName}_snr", "Model flux snr"))
     mapper.addOutputField(Field[float]("e1", "Source Ellipticity 1"))
     mapper.addOutputField(Field[float]("e2", "Source Ellipticity 1"))
@@ -295,12 +297,14 @@ def mergeCatalogs(
     aliasMap = schema.getAliasMap()
     for model in models:
         modelName = aliasMap[model] if model in aliasMap.keys() else model
-        mapper.addOutputField(
-            Field[float](f"{modelName}_mag", f"{modelName} magnitude")
-        )
-        mapper.addOutputField(
-            Field[float](f"{modelName}_magErr", f"{modelName} magnitude uncertainty")
-        )
+        if f"{modelName}_mag" not in schema:
+            mapper.addOutputField(
+                Field[float](f"{modelName}_mag", f"{modelName} magnitude")
+            )
+            mapper.addOutputField(
+                Field[float](f"{modelName}_magErr", f"{modelName} magnitude uncertainty")
+            )
+
     newSchema = mapper.getOutputSchema()
     newSchema.setAliasMap(schema.getAliasMap())