Changeset 31543

Timestamp:

May 12, 2011, 4:24:24 PM (15 years ago)

Author:

bills

Message:

fix problem reported in ticket 1484. Check for NAN in R1 and R2 prior to using
them to calculate and check the normWindow sizes.

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -899 +899 @@
     float R2 = Sr2 / Sf2;
 
+    if (!isfinite(R1) || !isfinite(R2)) {
+        psError(PM_ERR_STAMPS, true, "Kron Radii are not finite (failure to converge).");
+        psFree (stats);
+        psFree (flux1);
+        psFree (flux2);
+        psFree (norm1);
+        psFree (norm2);
+        return false;
+    }
+
     // Compare the Kron Radii (R1 & R2) to above to the FWHMs : if they are too discrepant, we will need to rescale
     psLogMsg ("psModules.imcombine", PS_LOG_DETAIL, "Kron Radii vs FWHMs 1: fwhm: %f, kron %f\n", fwhm1, R1);
@@ -907 +917 @@
     stamps->normWindow2 = 2.75*R2;
     psLogMsg ("psModules.imcombine", PS_LOG_DETAIL, "Windows from Kron Radii: %f for 1, %f for 2\n", stamps->normWindow1, stamps->normWindow2);
+
 
     // if the calculated normWindows are too large, we will fall off the stamps.  In this case, we need to try again.
@@ -919 +930 @@
         psFree (norm2);
         return false; 
-    }
-
-    if (!isfinite(R1) || !isfinite(R2)) {
-        psError(PM_ERR_STAMPS, true, "Kron Radii are not finite (failure to converge).");
-        psFree (stats);
-        psFree (flux1);
-        psFree (flux2);
-        psFree (norm1);
-        psFree (norm2);
-        return false;
     }