Changeset 9291

Timestamp:

Oct 5, 2006, 9:12:49 AM (20 years ago)

Author:

eugene

Message:

adding error checking to pmFPAfileIOChecks calls

File:

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

trunk/psphot/src/psphotImageLoop.c

@@ -19 +19 @@
     // files associated with the science image
     if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
+        psError(PS_ERR_UNKNOWN, false, "failed IO for fpa in psphot\n");
         psFree(view);
         return false;
     }
+
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
         psLogMsg ("psphot", 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)) {
+            psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d in psphot\n", view->chip);
+            psFree (view);
+            return false;
+        }
+        
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
             psLogMsg ("psphot", 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)) {
+                psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d in psphot\n", view->chip, view->cell);
+                psFree (view);
+                return false;
+            }
+            
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
+                    psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d, readout %d in psphot\n", view->chip, view->cell, view->readout);
+                    psFree (view);
+                    return false;
+                }
+                
                 if (! readout->data_exists) { continue; }
-
+                
                 // run the actual photometry analysis
-                psphotReadout (config, view);
-
-                pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+                if (!psphotReadout (config, view)) {
+                    psError(PS_ERR_UNKNOWN, false, "failed psphotReadout for chip %d, cell %d, readout %d\n", view->chip, view->cell, view->readout);
+                    psFree (view);
+                    return false;
+                }
+                
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
+                    psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d, readout %d in psphot\n", view->chip, view->cell, view->readout);
+                    psFree (view);
+                    return false;
+                }
             }
-            pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
+                psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d, cell %d in psphot\n", view->chip, view->cell);
+                psFree (view);
+                return false;
+            }
         }
-        pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
+            psError(PS_ERR_UNKNOWN, false, "failed IO for chip %d in psphot\n", view->chip);
+            psFree (view);
+            return false;
+        }
     }
-    pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
-
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) {
+        psError(PS_ERR_UNKNOWN, false, "failed IO for fpa in psphot\n");
+        psFree (view);
+        return false;
+    }
+    
     psFree (view);
     return true;