Merge branch 'tickets/DM-30927'

lsst · Sep 30, 2022 · 6c7c48a · 6c7c48a
2 parents 12d5fbe + 899dfca
commit 6c7c48a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/python/lsst/analysis/drp/catalogMatch.py b/python/lsst/analysis/drp/catalogMatch.py
@@ -223,6 +223,10 @@ def run(self, catalog):
 
         for selector in self.config.sourceSelectorActions:
             mask &= selector(catalog).astype(bool)
+        # Make sure the coordinates have valid entries
+        mask &= np.isfinite(catalog["coord_ra"])
+        mask &= np.isfinite(catalog["coord_dec"])
+
         targetCatalog = catalog[mask]
         targetCatalog = targetCatalog.reset_index()
 
@@ -378,7 +382,8 @@ def setRefCat(self, visitSummaryTable):
         corners = []
         for visSum in visitSummaryTable:
             for (ra, dec) in zip(visSum['raCorners'], visSum['decCorners']):
-                corners.append(lsst.geom.SpherePoint(ra, dec, units=lsst.geom.degrees).getVector())
+                if np.isfinite(ra) and np.isfinite(dec):
+                    corners.append(lsst.geom.SpherePoint(ra, dec, units=lsst.geom.degrees).getVector())
         visitBoundingCircle = lsst.sphgeom.ConvexPolygon.convexHull(corners).getBoundingCircle()
         center = lsst.geom.SpherePoint(visitBoundingCircle.getCenter())
         radius = visitBoundingCircle.getOpeningAngle()