Changeset 21139

Timestamp:

Jan 18, 2009, 9:43:36 AM (17 years ago)

Author:

eugene

Message:

sigmaCell and countsCell needed to get the concepts from outCell: why did this work before?

Location:

trunk/ppMerge/src

Files:

• ppMergeLoop.c (modified) (2 diffs)
• ppMergeLoop_Threaded.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeLoop.c

@@ -254 +254 @@
                 psFree(countsRO);
 
+                // XXX EAM 2009.01.18 : sigmaCell and countsCell need to have their concepts copied from outCell.
+                // This was causing segfaults for VYSOS5; Why did this ever work for SIMTEST?
+                if (!pmConceptsCopyCell(countsCell, outCell)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to copy cell concepts.");
+                    psFree(outRO);
+                    goto ERROR;
+                }
+
                 pmCell *sigmaCell = pmFPAfileThisCell(config->files, view, "PPMERGE.OUTPUT.SIGMA");
                 pmReadout *sigmaRO = pmReadoutAlloc(sigmaCell); // Readout with stdev per pixel
@@ -261 +269 @@
                 sigmaRO->data_exists = sigmaCell->data_exists = sigmaCell->parent->data_exists = true;
                 psFree(sigmaRO);
+
+                if (!pmConceptsCopyCell(sigmaCell, outCell)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to copy cell concepts.");
+                    psFree(outRO);
+                    goto ERROR;
+                }
             }
 

trunk/ppMerge/src/ppMergeLoop_Threaded.c

@@ -332 +332 @@
                 psFree(countsRO);
 
+                // XXX EAM 2009.01.18 : sigmaCell and countsCell need to have their concepts copied from outCell.
+                // This was causing segfaults for VYSOS5; Why did this ever work for SIMTEST?
+                if (!pmConceptsCopyCell(countsCell, outCell)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to copy cell concepts.");
+                    psFree(outRO);
+                    goto ERROR;
+                }
+
                 pmCell *sigmaCell = pmFPAfileThisCell(config->files, view, "PPMERGE.OUTPUT.SIGMA");
                 pmReadout *sigmaRO = pmReadoutAlloc(sigmaCell); // Readout with stdev per pixel
@@ -339 +347 @@
                 sigmaRO->data_exists = sigmaCell->data_exists = sigmaCell->parent->data_exists = true;
                 psFree(sigmaRO);
+
+                if (!pmConceptsCopyCell(sigmaCell, outCell)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to copy cell concepts.");
+                    psFree(outRO);
+                    goto ERROR;
+                }
             }