Changeset 15216 for trunk/psastro

Timestamp:

Oct 4, 2007, 9:55:03 AM (19 years ago)

Author:

eugene

Message:

clean up error handling on pmFPAfileIO

Location:

trunk/psastro/src

Files:

• psastroDataLoad.c (modified) (2 diffs)
• psastroDataSave.c (modified) (2 diffs)

trunk/psastro/src/psastroDataLoad.c

@@ -5 +5 @@
 // into the correct fpa structure locations (readout.analysis:PSPHOT.SOURCES)
 
+# define ESCAPE { \
+  psError(PS_ERR_UNKNOWN, false, "Failure in psastroDataSave"); \
+  psFree (view); \
+  return false; \
+}
+  
 // all of the different astrometry analysis modes use the same data load loop
 bool psastroDataLoad (pmConfig *config) {
@@ -33 +39 @@
 
     // files associated with the science image
-    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
 
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
         psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-        pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
 
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
             psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
-            pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
 
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
-                if (! readout->data_exists) { continue; }
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
+                if (!readout->data_exists) { continue; }
 
-                psastroConvertReadout (readout, recipe);
+                if (!psastroConvertReadout (readout, recipe)) ESCAPE;
 
-                pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
             }
-            pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
         }
-        pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
     }
-    pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
+
     psFree (view);
     return true;

trunk/psastro/src/psastroDataSave.c

@@ -2 +2 @@
 // XXX leak free 2006.04.27
 
+# define ESCAPE { \
+  psError(PS_ERR_UNKNOWN, false, "Failure in psastroDataSave"); \
+  psFree (view); \
+  return false; \
+}
+  
 // this loop saves the photometry/astrometry data files
 bool psastroDataSave (pmConfig *config) {
@@ -30 +36 @@
 
     // open/load files as needed
-    pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
 
     while ((chip = pmFPAviewNextChip (view, output->fpa, 1)) != NULL) {
         psTrace ("psastro", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-        pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
 
         while ((cell = pmFPAviewNextCell (view, output->fpa, 1)) != NULL) {
             psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
-            pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
 
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, output->fpa, 1)) != NULL) {
-                pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
-                if (! readout->data_exists) { continue; }
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
+                if (!readout->data_exists) { continue; }
 
-                pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
             }
-            pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
         }
-        pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
     }
-    pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) ESCAPE;
 
     // activate all files except PSASTRO.OUTPUT
-    pmFPAfileActivate (config->files, true, NULL);
-    pmFPAfileActivate (config->files, false, "PSASTRO.OUTPUT");
+    if (!pmFPAfileActivate (config->files, true, NULL)) ESCAPE;
+    if (!pmFPAfileActivate (config->files, false, "PSASTRO.OUTPUT")) ESCAPE;
 
     psFree (view);