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

Timestamp:

Sep 10, 2008, 2:59:24 PM (18 years ago)

Author:

Paul Price

Message:

Got '* glibc detected * ppStack: double free or corruption (): 0x00007f743f3f9190 *' mentioning pmConceptsAverageCells. Suspect that there's some memory corruption going on by calling pmConceptsAverageCells multiple times within threads. Moved it out of the stacking into ppStackLoop.

File:

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

trunk/ppStack/src/ppStackReadout.c

@@ -196 +196 @@
     psArray *stack = psArrayAlloc(num); // Array for stacking
 
-    pmCell *outCell = outRO->parent;    // Output cell
-    pmChip *outChip = outCell->parent;  // Output chip
-    pmFPA *outFPA = outChip->parent;    // Output FPA
-
-    float totExposure = 0.0;            // Total exposure time
-    psList *fpaList = psListAlloc(NULL); // List of input FPAs, for concept averaging
-    psList *cellList = psListAlloc(NULL); // List of input cells, for concept averaging
     int numGood = num;                  // Number of good inputs: images that haven't been completely rejected
     for (int i = 0; i < num; i++) {
@@ -222 +215 @@
         }
 
-        float exposure = psMetadataLookupF32(NULL, ro->parent->concepts, "CELL.EXPOSURE"); // Exposure time
-        if (!isfinite(exposure)) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    "CELL.EXPOSURE is not set for input file %ld", stack->n);
-            psFree(fpaList);
-            psFree(cellList);
-            psFree(stack);
-            return false;
-        }
-        totExposure += exposure;        // Total exposure time
-
         // Ensure there is a mask, or pmStackCombine will complain
         if (!ro->mask) {
@@ -239 +221 @@
         }
 
-        psListAdd(fpaList, PS_LIST_TAIL, fpa);
-        psListAdd(cellList, PS_LIST_TAIL, ro->parent);
-
         pmStackData *data = pmStackDataAlloc(ro, weighting);
         data->reject = psMemIncrRefCounter(rejected->data[i]);
@@ -250 +229 @@
                         numGood != num, useVariance, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
-        psFree(fpaList);
-        psFree(cellList);
         psFree(stack);
         return false;
@@ -267 +244 @@
 #endif
 
-    psMetadataAddF32(outCell->concepts, PS_LIST_TAIL, "CELL.EXPOSURE", PS_META_REPLACE,
-                     "Summed exposure time (sec)", totExposure);
-    psMetadataAddF32(outCell->parent->parent->concepts, PS_LIST_TAIL, "FPA.EXPOSURE", PS_META_REPLACE,
-                     "Summed exposure time (sec)", totExposure);
+    pmCell *outCell = outRO->parent;    // Output cell
+    pmChip *outChip = outCell->parent;  // Output chip
 
     outRO->data_exists = true;
     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);
+    outChip->data_exists = true;
 
     psFree(stack);