Changeset 14469 for trunk/ppStack/src/ppStackReadout.c

Timestamp:

Aug 10, 2007, 3:51:56 PM (19 years ago)

Author:

Paul Price

Message:

Debugging memory problem.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (7 diffs)

trunk/ppStack/src/ppStackReadout.c

@@ -63 +63 @@
             psFree(rng);
             psFree(fileIter);
+            psFree(fpaList);
+            psFree(cellList);
             psFree(stack);
             psFree(outRO);
@@ -80 +82 @@
             psFree(rng);
             psFree(fileIter);
+            psFree(fpaList);
+            psFree(cellList);
             psFree(outRO);
             psFree(stack);
@@ -111 +115 @@
     if (!pmStackCombine(outRO, stack, maskBad, maskBlank, iter, combineRej)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
+        psFree(fpaList);
+        psFree(cellList);
         psFree(stack);
         psFree(outRO);
@@ -142 +148 @@
     if (seeing && !pmStackReject(stack, maskBad, extent, convolveRej)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to reject input pixels.");
+        psFree(fpaList);
+        psFree(cellList);
         psFree(stack);
         psFree(outRO);
@@ -166 +174 @@
     if (!pmStackCombine(outRO, stack, maskBad, maskBlank, 0, combineRej)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
+        psFree(fpaList);
+        psFree(cellList);
         psFree(stack);
         psFree(outRO);
@@ -184 +194 @@
     outCell->data_exists = true;
     outCell->parent->data_exists = true;
+
+    // Copy other concepts
+    //    pmConceptsAverageFPAs(outFPA, fpaList);
+    pmConceptsAverageCells(outCell, cellList, NULL, NULL, true);
+    //    psFree(fpaList);
+    psFree(cellList);
 
     // Copy astrometry over
@@ -209 +225 @@
     }
 
-    // Copy other concepts
-    pmConceptsAverageFPAs(outFPA, fpaList);
-    pmConceptsAverageCells(outCell, cellList, NULL, NULL, true);
-    psFree(fpaList);
-    psFree(cellList);
-
     psFree(stack);
     psFree(outRO);                      // Drop reference