Change to FlagHandler and properly set failure flag names

lsst · May 3, 2024 · e8ac175 · e8ac175
1 parent 560e3e3
commit e8ac175
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/python/lsst/meas/base/compensatedGaussian/_compensatedGaussian.py b/python/lsst/meas/base/compensatedGaussian/_compensatedGaussian.py
@@ -36,11 +36,7 @@
 from ..sfm import SingleFramePlugin, SingleFramePluginConfig
 from ..pluginRegistry import register
 
-from .._measBaseLib import _compensatedGaussianFiltInnerProduct, MeasurementError
-
-
-class OutOfBoundsError(MeasurementError):
-    pass
+from .._measBaseLib import _compensatedGaussianFiltInnerProduct, FlagHandler, FlagDefinitionList
 
 
 class SingleFrameCompensatedGaussianFluxConfig(SingleFramePluginConfig):
@@ -77,17 +73,7 @@ def __init__(
     ):
         super().__init__(config, name, schema, metadata, logName, **kwds)
 
-        # create generic failure key
-        self.fatalFailKey = schema.addField(
-            f"{name}_flag", type="Flag", doc="Set to 1 for any fatal failure."
-        )
-
-        # Out of bounds failure key
-        self.ooBoundsKey = schema.addField(
-            f"{name}_bounds_flag",
-            type="Flag",
-            doc="Flag set to 1 if not all filters fit within exposure.",
-        )
+        flagDefs = FlagDefinitionList()
 
         self.width_keys = {}
         self._rads = {}
@@ -119,31 +105,46 @@ def __init__(
             mask_str = f"{base_key}_mask_bits"
             mask_key = schema.addField(mask_str, type=np.int32, doc="Mask bits set within aperture.")
 
-            self.width_keys[width] = (flux_key, err_key, mask_key)
+            # failure flags
+            failure_flag = flagDefs.add(f"{width}_flag", "Compensated Gaussian measurement failed")
+            oob_flag = flagDefs.add(f"{width}_flag_bounds", "Compensated Gaussian out-of-bounds")
+
+            self.width_keys[width] = (flux_key, err_key, mask_key, failure_flag, oob_flag)
             self._rads[width] = math.ceil(sps.norm.ppf((0.995,), scale=width * config.t)[0])
 
+        self.flagHandler = FlagHandler.addFields(schema, name, flagDefs)
         self._max_rad = max(self._rads)
 
     def fail(self, measRecord, error=None):
-        if isinstance(error, OutOfBoundsError):
-            measRecord.set(self.ooBoundsKey, True)
-        measRecord.set(self.fatalFailKey, True)
+        """Record failure
+
+        See also
+        --------
+        lsst.meas.base.SingleFramePlugin.fail
+        """
+        if error is None:
+            self.flagHandler.handleFailure(measRecord)
+        else:
+            self.flagHandler.handleFailure(measRecord, error.cpp)
 
     def measure(self, measRecord, exposure):
         center = measRecord.getCentroid()
         bbox = exposure.getBBox()
 
-        if Point2I(center) not in exposure.getBBox().erodedBy(self._max_rad):
-            raise OutOfBoundsError("Not all the kernels for this source fit inside the exposure.", 0)
-
         y = center.getY() - bbox.beginY
         x = center.getX() - bbox.beginX
 
         y_floor = math.floor(y)
         x_floor = math.floor(x)
 
-        for width, (flux_key, err_key, mask_key) in self.width_keys.items():
+        for width, (flux_key, err_key, mask_key, failure_flag, oob_flag) in self.width_keys.items():
             rad = self._rads[width]
+
+            if Point2I(center) not in exposure.getBBox().erodedBy(rad):
+                self.flagHandler.setValue(measRecord, failure_flag.number, True)
+                self.flagHandler.setValue(measRecord, oob_flag.number, True)
+                continue
+
             y_slice = slice(y_floor - rad, y_floor + rad + 1, 1)
             x_slice = slice(x_floor - rad, x_floor + rad + 1, 1)
             y_mean = y - y_floor + rad
@@ -153,7 +154,9 @@ def measure(self, measRecord, exposure):
             sub_var = exposure.variance.array[y_slice, x_slice]
 
             if sub_im.size == 0 or sub_im.shape[0] != sub_im.shape[1] or (sub_im.shape[0] % 2) == 0:
-                raise OutOfBoundsError("The footprint does not fit within the exposure.", 0)
+                self.flagHandler.setValue(measRecord, failure_flag.number, True)
+                self.flagHandler.setValue(measRecord, oob_flag.number, True)
+                continue
 
             flux, var = _compensatedGaussianFiltInnerProduct(
                 sub_im,

diff --git a/tests/test_CompensatedGaussianFlux.py b/tests/test_CompensatedGaussianFlux.py
@@ -274,7 +274,7 @@ def testCompensatedGaussianPlugin(self):
     def testCompensatedGaussianPluginFailure(self):
         """Test that a correct flag is set on failures."""
         config = self.makeSingleFrameMeasurementConfig("base_CompensatedGaussianFlux")
-        config.algorithms["base_CompensatedGaussianFlux"].kernel_widths = [5]
+        config.algorithms["base_CompensatedGaussianFlux"].kernel_widths = [5, 10]
         config.algorithms["base_CompensatedGaussianFlux"].t = 1.2
 
         task = self.makeSingleFrameMeasurementTask(config=config)
@@ -283,10 +283,12 @@ def testCompensatedGaussianPluginFailure(self):
         catalog[0]["slot_Centroid_x"] = -20.0
         catalog[1]["slot_Centroid_x"] = -15.0
         task.run(catalog, exposure)
-        self.assertTrue(catalog["base_CompensatedGaussianFlux_flag"][0])
-        self.assertTrue(catalog["base_CompensatedGaussianFlux_bounds_flag"][0])
-        self.assertTrue(catalog["base_CompensatedGaussianFlux_flag"][1])
-        self.assertTrue(catalog["base_CompensatedGaussianFlux_bounds_flag"][1])
+        self.assertTrue(catalog["base_CompensatedGaussianFlux_5_flag"][0])
+        self.assertTrue(catalog["base_CompensatedGaussianFlux_5_flag_bounds"][0])
+        self.assertTrue(catalog["base_CompensatedGaussianFlux_10_flag"][0])
+        self.assertTrue(catalog["base_CompensatedGaussianFlux_10_flag_bounds"][0])
+        self.assertTrue(catalog["base_CompensatedGaussianFlux_5_flag"][1])
+        self.assertTrue(catalog["base_CompensatedGaussianFlux_5_flag_bounds"][1])
 
     def testMonteCarlo(self):
         """Test an ideal simulation, with no noise.