Changeset 29017 for trunk/psphot/src/psphotBlendFit.c

Timestamp:

Aug 23, 2010, 1:54:55 PM (16 years ago)

Author:

eugene

Message:

remove unneeded fprintfs; do not fail on missing MIN,MAX_TOL values

File:

• trunk/psphot/src/psphotBlendFit.c (modified) (1 diff)

trunk/psphot/src/psphotBlendFit.c

@@ -66 +66 @@
 
     float fitMinTol = psMetadataLookupF32 (&status, recipe, "EXT_FIT_MIN_TOL"); // Fit tolerance
-    assert (status && isfinite(fitMinTol) && fitMinTol > 0);
+    if (!status || !isfinite(fitMinTol) || fitMinTol <= 0) {
+        fitMinTol = psMetadataLookupF32 (&status, recipe, "PSF_FIT_TOL"); // Fit tolerance
+        if (!status || !isfinite(fitMinTol) || fitMinTol <= 0) {
+            psAbort("PSF_FIT_MIN_TOL (and PSF_FIT_TOL) not defined or positive");
+        }
+    }
 
     float fitMaxTol = psMetadataLookupF32 (&status, recipe, "EXT_FIT_MAX_TOL"); // Fit tolerance
-    assert (status && isfinite(fitMaxTol) && fitMaxTol > 0);
+    if (!status || !isfinite(fitMaxTol) || fitMaxTol <= 0) {
+        fitMaxTol = 1.0;
+    }
 
     bool poisson = psMetadataLookupBool(&status, recipe, "POISSON.ERRORS.PHOT.LMM"); // Poisson errors?