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

Timestamp:

Jun 19, 2007, 4:49:08 PM (19 years ago)

Author:

Paul Price

Message:

Adding chip and mask output for chip-mosaicked files. Was going to make this the default output, but we only have to have it selected in the recipe. Reduced the name of the filerule down, so that it's not excessively long (e.g., PPIMAGE.OUTPUT.CHIP.MASK --> PPIMAGE.CHIP.MASK).

File:

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

trunk/ppImage/src/ppImageLoop.c

@@ -27 +27 @@
             return false;
         }
-        stats = psMetadataAlloc();
+        stats = psMetadataAlloc();
         psFree(resolved);
     }
@@ -34 +34 @@
     if (!status) {
         psErrorStackPrint(stderr, "Can't find input data!\n");
-        exit(EXIT_FAILURE);
+        ppImageCleanup(config, options);
+        exit(PS_EXIT_PROG_ERROR);
     }
 
@@ -42 +43 @@
     // files associated with the science image
     if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-        psFree (view);
+        psFree (view);
         return false;
     }
@@ -53 +54 @@
 
         if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-            psFree (view);
+            psFree (view);
             return false;
         }
@@ -63 +64 @@
             }
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-                psFree (view);
+                psFree (view);
                 return false;
             }
@@ -78 +79 @@
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-                    psFree (view);
+                    psFree (view);
                     return false;
                 }
@@ -88 +89 @@
                 if (!ppImageDetrendReadout(config, options, view)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to detrend readout.\n");
-                    psFree (view);
+                    psFree (view);
                     return false;
                 }
@@ -99 +100 @@
             pmChip *fringe = pmFPAfileThisChip(config->files, view, "PPIMAGE.FRINGE");
             if (!ppImageDetrendFringeSolve(chip, fringe, options)) {
-                psFree (view);
+                psFree (view);
                 return false;
             }
@@ -116 +117 @@
                 pmCell *fringeCell = pmFPAfileThisCell(config->files, view, "PPIMAGE.FRINGE");
                 if (!ppImageDetrendFringeGenerate(cell, fringeCell)) {
-                    psFree (view);
+                    psFree (view);
                     return false;
                 }
@@ -127 +128 @@
                 if (!mdok || !output) {
                     psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find file PPIMAGE.OUTPUT.\n");
-                    psFree (view);
-                    return false;
-                }
-
-                if (!ppStats(stats, 
-                             output->fpa, 
-                             view,
-                             options->satMask | options->badMask | options->maskValue,
-                             config)) {
+                    psFree (view);
+                    return false;
+                }
+
+                if (!ppStats(stats,
+                             output->fpa,
+                             view,
+                             options->satMask | options->badMask | options->maskValue,
+                             config)) {
                     psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to generate stats for image.\n");
-                    psFree (stats);
-                    psFree (view);
-                    return false;
-                }
-            }
-            
+                    psFree (stats);
+                    psFree (view);
+                    return false;
+                }
+            }
+
             // Add MD5 information for cell
             pmHDU *hdu = pmHDUFromCell(cell); // HDU that owns the cell
@@ -162 +163 @@
         }
 
-        if (!ppImageMosaicChip(config, view, "PPIMAGE.OUTPUT.CHIP", "PPIMAGE.OUTPUT")) {
+        if (!ppImageMosaicChip(config, options, view, "PPIMAGE.CHIP", "PPIMAGE.OUTPUT")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to mosaic chip.\n");
-            psFree (view);
+            psFree (view);
             return false;
         }
         if (!ppImageRebinChip(config, view, "PPIMAGE.BIN1")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
-            psFree (view);
+            psFree (view);
             return false;
         }
         if (!ppImageRebinChip(config, view, "PPIMAGE.BIN2")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
-            psFree (view);
+            psFree (view);
             return false;
         }
@@ -181 +182 @@
         if (options->doPhotom) {
             if (!ppImagePhotom(config, view)) {
-                psError(PS_ERR_UNKNOWN, false, "error running photometry.\n");
-                psFree (view);
-                return false;
-            }
+                psError(PS_ERR_UNKNOWN, false, "error running photometry.\n");
+                psFree (view);
+                return false;
+            }
         }
 
@@ -195 +196 @@
 
             if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
-                psFree(view);
+                psFree(view);
                 return false;
             }
@@ -202 +203 @@
         // Close chip
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
-            psFree(view);
+            psFree(view);
             return false;
         }
@@ -221 +222 @@
 
     // XXX an optional full-scale FPA mosaic could happen here
-    // it would require us to NOT free PPIMAGE.OUTPUT.CHIP until here
-    // ppImageMosaicFPA (config, "PPIMAGE.OUTPUT.FPA", "PPIMAGE.OUTPUT.CHIP");
-    ppImageMosaicFPA(config, "PPIMAGE.OUTPUT.FPA1", "PPIMAGE.BIN1");
-    ppImageMosaicFPA(config, "PPIMAGE.OUTPUT.FPA2", "PPIMAGE.BIN2");
+    // it would require us to NOT free PPIMAGE.CHIP until here
+    // ppImageMosaicFPA (config, "PPIMAGE.OUTPUT.FPA", "PPIMAGE.CHIP");
+    ppImageMosaicFPA(config, options, "PPIMAGE.OUTPUT.FPA1", "PPIMAGE.BIN1");
+    ppImageMosaicFPA(config, options, "PPIMAGE.OUTPUT.FPA2", "PPIMAGE.BIN2");
 
     // we perform astrometry on all chips after sources have been detected
     if (options->doAstromChip || options->doAstromMosaic) {
         if (!ppImageAstrom(config)) {
-            psError(PS_ERR_UNKNOWN, false, "error running astrometry.\n");
-            psFree(view);
-            return false;
-        }
+            psError(PS_ERR_UNKNOWN, false, "error running astrometry.\n");
+            psFree(view);
+            return false;
+        }
     }
 
     // Close FPA
     if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
-        psFree(view);
+        psFree(view);
         return false;
     }