Changeset 34041 for branches/meh_branches/ppstack_test/psphot/src/psphotRadialProfileWings.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotRadialProfileWings.c (modified) (4 diffs)

branches/meh_branches/ppstack_test/psphot/src/psphotRadialProfileWings.c

@@ -55 +55 @@
 static float MIN_RADIUS = NAN;
 static float SKY_STDEV  = NAN;
+static float SKY_SLOPE_MIN = NAN;
 // static FILE *file = NULL;
 
@@ -81 +82 @@
 
     MIN_RADIUS = psMetadataLookupF32 (&status, readout->analysis, "PSF_MOMENTS_RADIUS");
-    if (!status) {
+    if (!status || (MIN_RADIUS > MAX_RADIUS)) {
         MIN_RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS");
     }
@@ -89 +90 @@
     if (!status) {
         SKY_STDEV = 1.0; // a crude default value (why would this not exist?)
+    }
+
+    // SKY_SLOPE_MIN is the sigma of the sky model (ie, smoothed on large scales)
+    SKY_SLOPE_MIN = psMetadataLookupF32 (&status, recipe, "SKY_SLOPE_MIN");
+    if (!status) {
+        SKY_SLOPE_MIN = 3.0; 
     }
 
@@ -302 +309 @@
             limitSlope = slope;
         }
-        if (!limit && isfinite(slope) && (fabs(slope) < 3.0)) { 
+        if (!limit && isfinite(slope) && (fabs(slope) < SKY_SLOPE_MIN)) { 
             // SB no longer changing.       
             limit = true;
             // linearly interpolate to the radius at which we hit the sky, using the last flux and the limiting slope
             if (isfinite(lastFlux)) {
-                limitRadius = lastRadius + lastFlux / 3.0;
+                float interpolatedRadius = lastRadius + lastFlux / SKY_SLOPE_MIN;
+                if (interpolatedRadius < MAX_RADIUS) {
+                    limitRadius = interpolatedRadius;
+                } else {
+                    // XXX should we keep going in this case?
+                    limitRadius = meanRadius;
+                }
             } else {
                 limitRadius = meanRadius;