Changeset 7581 for trunk/ppImage/src/ppImageLoop.c

Timestamp:

Jun 15, 2006, 3:03:49 PM (20 years ago)

Author:

eugene

Message:

substantial work on the image loop, support for DetDB

File:

• trunk/ppImage/src/ppImageLoop.c (modified) (4 diffs)

trunk/ppImage/src/ppImageLoop.c

@@ -17 +17 @@
 
     // files associated with the science image
-    pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
 
     while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
         psLogMsg ("ppImageLoop", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         if (!chip->process || !chip->file_exists) { continue; }
-        pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
 
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
             psLogMsg ("ppImageLoop", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
             if (!cell->process || !cell->file_exists) { continue; }
-            pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
 
             // process each of the readouts
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                pmFPAfileIOChecks (config->files, view, PM_FPA_BEFORE);
-                if (! readout->data_exists) { continue; }
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) return false;
+                if (!readout->data_exists) { continue; }
 
                 // perform the detrend analysis
@@ -40 +40 @@
                 if (options->doBin2) ppImageRebinReadout (config, view, "PPIMAGE.BIN2");
 
-                pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+                if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
             }
-            pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+            if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
         }
 
@@ -50 +50 @@
         if (options->doPhotom) ppImagePhotom (config, view);
 
-        pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
 
         // XXX paul added these frees: make sure the same is happening in the pmFileIOChecks
@@ -68 +68 @@
     // ppImageJpegFPA (config, view);
 
-    pmFPAfileIOChecks (config->files, view, PM_FPA_AFTER);
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_AFTER)) return false;
 
     psFree (view);