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

Timestamp:

Dec 8, 2006, 2:43:04 PM (20 years ago)

Author:

Paul Price

Message:

Adding error checking; only close files after all operations are pau.

File:

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

trunk/ppImage/src/ppImageLoop.c

@@ -142 +142 @@
             }
 
+#if 0
             if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
                 return false;
             }
-        }
-
-        ppImageMosaicChip(config, view, "PPIMAGE.OUTPUT.CHIP", "PPIMAGE.OUTPUT");
-        ppImageRebinChip(config, view, "PPIMAGE.BIN1", "PPIMAGE.OUTPUT.CHIP");
-        ppImageRebinChip(config, view, "PPIMAGE.BIN2", "PPIMAGE.OUTPUT.CHIP");
+#endif
+
+        }
+
+        if (!ppImageMosaicChip(config, view, "PPIMAGE.OUTPUT.CHIP", "PPIMAGE.OUTPUT")) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to mosaic chip.\n");
+            return false;
+        }
+        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN1", "PPIMAGE.OUTPUT.CHIP")) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
+            return false;
+        }
+        if (!ppImageRebinChip(config, view, "PPIMAGE.BIN2", "PPIMAGE.OUTPUT.CHIP")) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
+            return false;
+        }
 
         // we perform photometry on the readouts of this chip in the output
@@ -156 +168 @@
         }
 
+        // Close cells
+        view->cell = -1;
+        while ((cell = pmFPAviewNextCell(view, input->fpa, 1)) != NULL) {
+            if (!cell->process || !cell->file_exists) {
+                continue;
+            }
+
+            if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+                return false;
+            }
+        }
+
+        // Close chip
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
             return false;