Changeset 13837

Timestamp:

Jun 14, 2007, 2:47:06 PM (19 years ago)

Author:

eugene

Message:

catch errors from psphot, psastro; fix mem leaks

File:

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

trunk/ppImage/src/ppImageLoop.c

@@ -42 +42 @@
     // files associated with the science image
     if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+        psFree (view);
         return false;
     }
@@ -52 +53 @@
 
         if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+            psFree (view);
             return false;
         }
@@ -61 +63 @@
             }
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+                psFree (view);
                 return false;
             }
@@ -75 +78 @@
             while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+                    psFree (view);
                     return false;
                 }
@@ -84 +88 @@
                 if (!ppImageDetrendReadout(config, options, view)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to detrend readout.\n");
+                    psFree (view);
                     return false;
                 }
@@ -94 +99 @@
             pmChip *fringe = pmFPAfileThisChip(config->files, view, "PPIMAGE.FRINGE");
             if (!ppImageDetrendFringeSolve(chip, fringe, options)) {
+                psFree (view);
                 return false;
             }
@@ -110 +116 @@
                 pmCell *fringeCell = pmFPAfileThisCell(config->files, view, "PPIMAGE.FRINGE");
                 if (!ppImageDetrendFringeGenerate(cell, fringeCell)) {
+                    psFree (view);
                     return false;
                 }
@@ -120 +127 @@
                 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)) {
+                             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;
                 }
@@ -151 +160 @@
                 psFree(headerName);
             }
-
-#if 0
-            if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
-                return false;
-            }
-#endif
-
         }
 
         if (!ppImageMosaicChip(config, view, "PPIMAGE.OUTPUT.CHIP", "PPIMAGE.OUTPUT")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to mosaic chip.\n");
+            psFree (view);
             return false;
         }
         if (!ppImageRebinChip(config, view, "PPIMAGE.BIN1")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
+            psFree (view);
             return false;
         }
         if (!ppImageRebinChip(config, view, "PPIMAGE.BIN2")) {
             psError(PS_ERR_UNKNOWN, false, "Unable to bin chip.\n");
+            psFree (view);
             return false;
         }
@@ -175 +180 @@
         // we perform photometry on the readouts of this chip in the output
         if (options->doPhotom) {
-            ppImagePhotom(config, view);
+            if (!ppImagePhotom(config, view)) {
+                psError(PS_ERR_UNKNOWN, false, "error running photometry.\n");
+                psFree (view);
+                return false;
+            }
         }
 
@@ -186 +195 @@
 
             if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+                psFree(view);
                 return false;
             }
@@ -192 +202 @@
         // Close chip
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+            psFree(view);
             return false;
         }
@@ -198 +209 @@
     // Write out summary statistics
     if (stats) {
-        const char *statsMDC = psMetadataConfigFormat(stats);
+        char *statsMDC = psMetadataConfigFormat(stats);
         if (!statsMDC || strlen(statsMDC) == 0) {
             psError(PS_ERR_IO, false, "Unable to get statistics MDC file.\n");
@@ -204 +215 @@
             fprintf(statsFile, "%s", statsMDC);
         }
-        psFree((void *)statsMDC);
+        psFree(statsMDC);
         fclose(statsFile);
         psFree(stats);
@@ -217 +228 @@
     // we perform astrometry on all chips after sources have been detected
     if (options->doAstromChip || options->doAstromMosaic) {
-        ppImageAstrom(config);
-    }
-    // XXX should we keep the addstar command as an option, or just run it externally?
-    // XXX if we included direct Ohana/DVO API calls, we could send the data from within ppImage.
-# if (0)    
-    if (options->doAddstar) {
-        ppImageAddstar(config);
-    }
-# endif
-
+        if (!ppImageAstrom(config)) {
+            psError(PS_ERR_UNKNOWN, false, "error running astrometry.\n");
+            psFree(view);
+            return false;
+        }
+    }
+
+    // Close FPA
     if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
+        psFree(view);
         return false;
     }
 
     psFree(view);
-
     return true;
 }