Changeset 33412 for tags/ipp-20120216

Timestamp:

Mar 5, 2012, 5:01:25 PM (14 years ago)

Author:

bills

Message:

Pick up a couple of fixes to psphotStackProblems from the trunk including one of the causes of
the memory explosion

Location:

tags/ipp-20120216/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotRadialProfileWings.c (modified) (1 diff)
• src/psphotSersicModelClass.c (modified) (1 diff)
• src/psphotStackImageLoop.c (modified) (1 prop)

tags/ipp-20120216/psphot/src/psphotRadialProfileWings.c

@@ -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;

tags/ipp-20120216/psphot/src/psphotSersicModelClass.c

@@ -546 +546 @@
     // set the normalization by linear fit between model and data
     psphotSersicModelNorm (pcm, source);
+    if (!isfinite(PAR[PM_PAR_I0])) {
+        fprintf(stderr, "psphotSersicModelClassGuessPCM: psphotSerisicModelNorm set PM_PAR_I0 to NAN\n");
+        return false;
+    }
 
     if (TIMING) { t5 = psTimerMark ("SersicGuess"); }