Changeset 35458 for branches/eam_branches/ipp-20130419/psphot/src/psphotRadialApertures.c

Timestamp:

May 1, 2013, 3:17:52 PM (13 years ago)

Author:

eugene

Message:

require at least a minimum subset of radial apertures; do not remove the SATSTAR flag if peak is below saturation (since we do not include the local sky in the test)

File:

• branches/eam_branches/ipp-20130419/psphot/src/psphotRadialApertures.c (modified) (3 diffs)

branches/eam_branches/ipp-20130419/psphot/src/psphotRadialApertures.c

@@ -47 +47 @@
 static float outerRadius = NAN;
 static float SN_LIM = NAN;
+static int RADIAL_AP_MIN = 5;
 static psImageMaskType maskVal = 0;
 
@@ -115 +116 @@
     // S/N limit to perform full non-linear fits
     SN_LIM = psMetadataLookupF32 (&status, recipe, "RADIAL_APERTURES_SN_LIM");
+
+    // S/N limit to perform full non-linear fits
+    RADIAL_AP_MIN = psMetadataLookupS32 (&status, recipe, "RADIAL.ANNULAR.BINS.MIN");
+    if (!status) {
+      RADIAL_AP_MIN = 5;
+    }
 
     // source analysis is done in S/N order (brightest first)
@@ -310 +317 @@
 
     // find the largest aperture of interest (use only apertures with inner radii <=
-    // source->skyRadius)
+    // source->skyRadius, as long as i >= RADIAL_AP_MIN
     int lastAp = aperRadii->n;
-    for (int i = 0; i < aperRadii->n; i++) {
-        if (aperRadii->data.F32[i] < source->skyRadius) continue;
+    for (int i = RADIAL_AP_MIN; i < aperRadii->n; i++) {
+        if (aperRadii->data.F32[i] < source->skyRadius) continue; // measure out to this radius
         lastAp = i + 1;
         break;