Changeset 33640 for branches/eam_branches/ipp-20111122/psphot/src/psphotRadialProfileWings.c

Timestamp:

Mar 30, 2012, 2:54:17 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/psphot

Files:

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

branches/eam_branches/ipp-20111122/psphot/src/psphotRadialProfileWings.c

@@ -147 +147 @@
 
         // wait for the threads to finish and manage results
-        if (!psThreadPoolWait (false)) {
+        if (!psThreadPoolWait (false, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to guess model.");
             return false;
@@ -307 +307 @@
             // 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 / 3.0;
+                if (interpolatedRadius < MAX_RADIUS) {
+                    limitRadius = interpolatedRadius;
+                } else {
+                    // XXX should we keep going in this case?
+                    limitRadius = meanRadius;
+                }
             } else {
                 limitRadius = meanRadius;