Changeset 10589

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.

Location:

trunk/ppImage/src

Files:

• ppImageLoop.c (modified) (2 diffs)
• ppImageMosaic.c (modified) (1 diff)
• ppImageRebinReadout.c (modified) (3 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;

trunk/ppImage/src/ppImageMosaic.c

@@ -21 +21 @@
     }
 
-    pmFPAAddSourceFromView(out->fpa, view, out->format);
     pmChip *outChip = pmFPAviewThisChip(view, out->fpa);
     pmChip *inChip = pmFPAviewThisChip(view, in->fpa);
+    if (!outChip->hdu && !outChip->parent->hdu) {
+        pmFPAAddSourceFromView(out->fpa, view, out->format);
+    }
 
     // Copy over concepts

trunk/ppImage/src/ppImageRebinReadout.c

@@ -11 +11 @@
 
     pmFPAfile *inFile = psMetadataLookupPtr (NULL, config->files, inName);
-    if (inFile == NULL) return NULL;
+    if (inFile == NULL) return false;
 
     pmFPAfile *outFile = psMetadataLookupPtr (NULL, config->files, outName);
-    if (outFile == NULL) return NULL;
+    if (outFile == NULL) return false;
 
     // XXX double check that chip != -1?
@@ -20 +20 @@
     pmChip *inChip = pmFPAviewThisChip (view, inFile->fpa);
     pmChip *outChip = pmFPAviewThisChip (view, outFile->fpa);
-    pmChipCopyStructure (outChip, inChip, outFile->xBin, outFile->yBin);
+    if (!pmChipCopyStructure (outChip, inChip, outFile->xBin, outFile->yBin)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to copy chip structure.");
+        return false;
+    }
 
     while ((cell = pmFPAviewNextCell (view, inFile->fpa, 1)) != NULL) {
@@ -56 +59 @@
         binItem->data.S32 = yBin * outFile->yBin;
     }
+
     return true;
 }