Merge branch 'tickets/DM-40797'

lsst · Dec 21, 2023 · 82188b7 · 82188b7
2 parents 3c3afe3 + 77ac61d
commit 82188b7
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/pipelines/coaddQualityCore.yaml b/pipelines/coaddQualityCore.yaml
@@ -39,7 +39,7 @@ tasks:
   catalogMatchTract:
     class: lsst.analysis.tools.tasks.astrometricCatalogMatch.AstrometricCatalogMatchTask
     config:
-      connections.refCatalog: gaia_dr2_20200414
+      connections.refCatalog: gaia_dr3_20230707
   refCatObjectTract:
     class: lsst.analysis.tools.tasks.refCatObjectAnalysis.RefCatObjectAnalysisTask
     config:

diff --git a/pipelines/visitQualityCore.yaml b/pipelines/visitQualityCore.yaml
@@ -15,7 +15,7 @@ tasks:
   catalogMatchVisit:
     class: lsst.analysis.tools.tasks.astrometricCatalogMatch.AstrometricCatalogMatchVisitTask
     config:
-      connections.refCatalog: gaia_dr2_20200414
+      connections.refCatalog: gaia_dr3_20230707
   astrometricRefCatSourceVisit:
     class: lsst.analysis.tools.tasks.refCatSourceAnalysis.RefCatSourceAnalysisTask
     config:

diff --git a/python/lsst/analysis/tools/tasks/astrometricCatalogMatch.py b/python/lsst/analysis/tools/tasks/astrometricCatalogMatch.py
@@ -84,19 +84,19 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
 class AstrometricCatalogMatchVisitConnections(
     pipeBase.PipelineTaskConnections,
     dimensions=("visit",),
-    defaultTemplates={"targetCatalog": "sourceTable_visit", "refCatalog": "gaia_dr2_20200414"},
+    defaultTemplates={"targetCatalog": "sourceTable_visit", "refCatalog": "gaia_dr3_20230707"},
 ):
     catalog = pipeBase.connectionTypes.Input(
         doc="The visit-wide catalog to make plots from.",
         storageClass="ArrowAstropy",
-        name="sourceTable_visit",
+        name="{targetCatalog}",
         dimensions=("visit",),
         deferLoad=True,
     )
 
     refCat = pipeBase.connectionTypes.PrerequisiteInput(
         doc="The astrometry reference catalog to match to loaded input catalog sources.",
-        name="gaia_dr2_20200414",
+        name="{refCatalog}",
         storageClass="SimpleCatalog",
         dimensions=("skypix",),
         deferLoad=True,

diff --git a/python/lsst/analysis/tools/tasks/catalogMatch.py b/python/lsst/analysis/tools/tasks/catalogMatch.py
@@ -191,6 +191,12 @@ def run(self, *, catalog, loadedRefCat, bands):
             # Which I think is okay, but the current task
             # allows different units. Need to configure match
             # radius, either in this task or a subtask.
+
+            # Get rid of entries in the refCat with non-finite RA/Dec values.
+            refRas = loadedRefCat["ra"]
+            refDecs = loadedRefCat["dec"]
+            refRaDecFiniteMask = np.isfinite(refRas) & np.isfinite(refDecs)
+            loadedRefCat = loadedRefCat[refRaDecFiniteMask]
             with Matcher(loadedRefCat["ra"], loadedRefCat["dec"]) as m:
                 idx, refMatchIndices, targetMatchIndices, dists = m.query_radius(
                     targetCatalog[self.config.raColumn],

diff --git a/python/lsst/analysis/tools/tasks/refCatObjectAnalysis.py b/python/lsst/analysis/tools/tasks/refCatObjectAnalysis.py
@@ -33,8 +33,8 @@ class RefCatObjectAnalysisConnections(
     dimensions=("skymap", "tract"),
     defaultTemplates={
         "targetCatalog": "objectTable_tract",
-        "refCatalog": "gaia_dr2_20200414",
-        "outputName": "objectTable_tract_gaia_dr2_20200414_match",
+        "refCatalog": "gaia_dr3_20230707",
+        "outputName": "objectTable_tract_gaia_dr3_20230707_match",
     },
 ):
     data = ct.Input(

diff --git a/python/lsst/analysis/tools/tasks/refCatObjectPhotometricAnalysis.py b/python/lsst/analysis/tools/tasks/refCatObjectPhotometricAnalysis.py
@@ -31,11 +31,15 @@
 class RefCatObjectPhotometricAnalysisConnections(
     AnalysisBaseConnections,
     dimensions=("skymap", "tract"),
-    defaultTemplates={"outputName": "objectTable_tract_ps1_pv3_3pi_20170110_match"},
+    defaultTemplates={
+        "targetCatalog": "objectTable_tract",
+        "refCatalog": "ps1_pv3_3pi_20170110",
+        "outputName": "objectTable_tract_ps1_pv3_3pi_20170110_match",
+    },
 ):
     data = ct.Input(
         doc="Tract based object table to load from the butler",
-        name="objectTable_tract_ps1_pv3_3pi_20170110_match",
+        name="{targetCatalog}_{refCatalog}_match",
         storageClass="ArrowAstropy",
         deferLoad=True,
         dimensions=("skymap", "tract"),

diff --git a/python/lsst/analysis/tools/tasks/refCatSourceAnalysis.py b/python/lsst/analysis/tools/tasks/refCatSourceAnalysis.py
@@ -30,11 +30,15 @@
 class RefCatSourceAnalysisConnections(
     AnalysisBaseConnections,
     dimensions=("visit",),
-    defaultTemplates={"outputName": "sourceTable_visit_gaia_dr2_20200414_match"},
+    defaultTemplates={
+        "targetCatalog": "sourceTable_visit",
+        "refCatalog": "gaia_dr3_20230707",
+        "outputName": "sourceTable_visit_gaia_dr3_20230707_match",
+    },
 ):
     data = ct.Input(
         doc="Tract based object table to load from the butler",
-        name="sourceTable_visit_gaia_dr2_20200414_match",
+        name="{targetCatalog}_{refCatalog}_match",
         storageClass="ArrowAstropy",
         deferLoad=True,
         dimensions=("visit",),

diff --git a/tests/test_catalogMatch.py b/tests/test_catalogMatch.py
@@ -70,7 +70,7 @@ def setUp(self):
         loaderTask = LoadReferenceCatalogTask(
             config=config.referenceCatalogLoader,
             dataIds=[refDataId],
-            name="gaia_dr2_20200414",
+            name="gaia_dr3_20230707",
             refCats=[deferredRefCat],
         )
         self.loadedRefCat = self.task._loadRefCat(loaderTask, tract)