Add edge flag for NaiveFlux, to account for cases when aperture doesn…

…'t fit in frame
lsst · Oct 13, 2014 · 6cae377 · 6cae377
1 parent 3307cc4
commit 6cae377
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/include/lsst/meas/base/NaiveFlux.h b/include/lsst/meas/base/NaiveFlux.h
@@ -77,6 +77,7 @@ class NaiveFluxAlgorithm {
      *  Inspect getFlagDefinitions() for more detailed explanations of each flag.
      */
     enum FlagBits {
+        EDGE,
         N_FLAGS
     };
 
@@ -85,7 +86,9 @@ class NaiveFluxAlgorithm {
      *         in catalog schemas.
      */
     static boost::array<FlagDef,N_FLAGS> const & getFlagDefinitions() {
-        static boost::array<FlagDef,N_FLAGS> const flagDefs = {};
+        static boost::array<FlagDef,N_FLAGS> const flagDefs = {{
+            {"edge", "source is too close to the edge of the field to compute the given aperture"}
+        }};
         return flagDefs;
     }
 

diff --git a/src/NaiveFlux.cc b/src/NaiveFlux.cc
@@ -171,7 +171,15 @@ void NaiveFluxAlgorithm::apply(
         ctrl.radius,
         imageBBox
         );
-    fluxFunctor.apply(foot);
+    try {
+        fluxFunctor.apply(foot);
+    } catch (pex::exceptions::LengthError &) {
+        throw LSST_EXCEPT(
+            MeasurementError,
+            getFlagDefinitions()[EDGE].doc,
+            EDGE
+        );
+    }
 
     result.flux = fluxFunctor.getSum();
     result.fluxSigma = ::sqrt(fluxFunctor.getSumVar());