Changeset 9519

Timestamp:

Oct 12, 2006, 11:48:41 AM (20 years ago)

Author:

eugene

Message:

added error checks to psphotReadoutCleanup

File:

• trunk/psphot/src/psphotReadout.c (modified) (7 diffs)

trunk/psphot/src/psphotReadout.c

@@ -40 +40 @@
 
     if (!strcasecmp (breakPt, "PEAKS")) {
-        psphotReadoutCleanup (config, readout, recipe, NULL, sources);
+        if (!psphotReadoutCleanup (config, readout, recipe, NULL, sources)) return false;
         return true;
     }
@@ -57 +57 @@
     }
     if (!strcasecmp (breakPt, "MOMENTS")) {
-        psphotReadoutCleanup (config, readout, recipe, NULL, sources);
+        if (!psphotReadoutCleanup (config, readout, recipe, NULL, sources)) return false;
         return true;
     }
@@ -64 +64 @@
     pmPSF *psf = psphotChoosePSF (readout, sources, recipe);
     if (!strcasecmp (breakPt, "PSFMODEL")) {
-        psphotReadoutCleanup (config, readout, recipe, psf, sources);
+        if (!psphotReadoutCleanup (config, readout, recipe, psf, sources)) return false;
         return true;
     }
@@ -71 +71 @@
     psphotEnsemblePSF (readout, sources, recipe, psf, FALSE);
     if (!strcasecmp (breakPt, "ENSEMBLE")) {
-        psphotReadoutCleanup (config, readout, recipe, psf, sources);
+        if (!psphotReadoutCleanup (config, readout, recipe, psf, sources)) return false;
         return true;
     }
@@ -94 +94 @@
         psTrace ("psphotReadout", 4, "failure on psphotApResid"); 
         psError(PSPHOT_ERR_PHOTOM, false, "Measure aperture photometry corrections");
-        psphotReadoutCleanup (config, readout, recipe, psf, sources);
         return false;
     }
@@ -109 +108 @@
 
     // create the exported-metadata and free local data
-    psphotReadoutCleanup (config, readout, recipe, psf, sources);
+    if (!psphotReadoutCleanup (config, readout, recipe, psf, sources)) return false;
     return true;
 }
@@ -117 +116 @@
     // use the psf-model to measure FWHM stats
     if (psf) {
-        psphotPSFstats (readout, recipe, psf);
-    } else {
-        psphotMomentsStats (readout, recipe, sources);
+        if (!psphotPSFstats (readout, recipe, psf)) {
+            psError(PS_ERR_IO, true, "Failed to measure PSF shape parameters");
+            return false;
+        }
+    } else if (sources) {
+        if (!psphotMomentsStats (readout, recipe, sources)) {
+            psError(PS_ERR_IO, true, "Failed to measure Moment shape parameters");
+            return false;
+        }
     }