Merge pull request #1173 from lsst/tickets/DM-52921

DM-52921: Catch more errors as AnnotatedPartialOutputsError

Author: fred3m

python/lsst/pipe/tasks/multiBand.py

@@ -35,9 +35,15 @@
 )
 import lsst.pipe.base.connectionTypes as cT
 from lsst.pex.config import Field, ConfigurableField, ChoiceField
-from lsst.meas.algorithms import DynamicDetectionTask, ReferenceObjectLoader, ScaleVarianceTask, \
-    SetPrimaryFlagsTask
-from lsst.meas.algorithms.subtractBackground import TooManyMaskedPixelsError
+from lsst.meas.algorithms import (
+    DynamicDetectionTask,
+    ExceedsMaxVarianceScaleError,
+    InsufficientSourcesError,
+    ReferenceObjectLoader,
+    ScaleVarianceTask,
+    SetPrimaryFlagsTask,
+    TooManyMaskedPixelsError,
+)
 from lsst.meas.base import (
     SingleFrameMeasurementTask,
     ApplyApCorrTask,
@@ -254,7 +260,7 @@ def runQuantum(self, butlerQC, inputRefs, outputRefs):
                 expId=idGenerator.catalog_id,
                 patchInfo=patchInfo,
             )
-        except TooManyMaskedPixelsError as e:
+        except (TooManyMaskedPixelsError, ExceedsMaxVarianceScaleError, InsufficientSourcesError) as e:
             if self.config.writeEmptyBackgrounds:
                 butlerQC.put(self._makeEmptyBackground(exposure, patchInfo), outputRefs.outputBackgrounds)
             error = AnnotatedPartialOutputsError.annotate(