Merge pull request #919 from lsst/tickets/DM-42981

DM-42981: Maintain previous behavior for astrometry errors
lsst · Apr 23, 2024 · b195f7a · b195f7a
2 parents 14a832a + 4451e3c
commit b195f7a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/python/lsst/pipe/tasks/calibrate.py b/python/lsst/pipe/tasks/calibrate.py
@@ -29,7 +29,7 @@
 import lsst.pipe.base as pipeBase
 import lsst.pipe.base.connectionTypes as cT
 import lsst.afw.table as afwTable
-from lsst.meas.astrom import AstrometryTask, displayAstrometry, denormalizeMatches
+from lsst.meas.astrom import AstrometryTask, displayAstrometry, denormalizeMatches, AstrometryError
 from lsst.meas.algorithms import LoadReferenceObjectsConfig, SkyObjectsTask
 import lsst.daf.base as dafBase
 from lsst.afw.math import BackgroundList
@@ -634,12 +634,13 @@ def run(self, exposure, background=None,
         astromMatches = None
         matchMeta = None
         if self.config.doAstrometry:
-            astromRes = self.astrometry.run(
-                exposure=exposure,
-                sourceCat=sourceCat,
-            )
-            astromMatches = astromRes.matches
-            matchMeta = astromRes.matchMeta
+            try:
+                astromRes = self.astrometry.run(exposure=exposure, sourceCat=sourceCat)
+                astromMatches = astromRes.matches
+                matchMeta = astromRes.matchMeta
+            except AstrometryError as e:
+                # Maintain old behavior of not stopping for astrometry errors.
+                self.log.warning(e)
             if exposure.getWcs() is None:
                 if self.config.requireAstrometry:
                     raise RuntimeError(f"WCS fit failed for {idGenerator} and requireAstrometry "