Changeset 34800 for trunk/ppStack/src/ppStackThread.c

Timestamp:

Dec 11, 2012, 2:04:31 PM (14 years ago)

Author:

watersc1

Message:

Merge from my branch including background restoration and stack stage projection cell binned images.

Location:

trunk

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackThread.c (modified) (4 diffs)

trunk/ppStack/src/ppStackThread.c

@@ -40 +40 @@
     psFree(stack->maskFits);
     psFree(stack->varianceFits);
+    psFree(stack->bkgFits);
     return;
 }
@@ -67 +68 @@
         PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, covariances, NULL);
     }
-
+    
     ppStackThreadData *stack = psAlloc(sizeof(ppStackThreadData)); // Thread data, to return
     psMemSetDeallocator(stack, (psFreeFunc)stackThreadDataFree);
@@ -77 +78 @@
     stack->maskFits   = psArrayAlloc(numInputs);
     stack->varianceFits = psArrayAlloc(numInputs);
+    stack->bkgFits    = psArrayAlloc(numInputs);
     for (int i = 0; i < numInputs; i++) {
         if (!cells->data[i]) {
@@ -95 +97 @@
             psFree(resolved); \
         }
-
+                
         IMAGE_OPEN(imageNames, stack->imageFits, i);
-        IMAGE_OPEN(maskNames, stack->maskFits, i);
-        IMAGE_OPEN(varianceNames, stack->varianceFits, i);
+        if (maskNames) {
+          IMAGE_OPEN(maskNames, stack->maskFits, i);
+        }
+        if (varianceNames) {
+          IMAGE_OPEN(varianceNames, stack->varianceFits, i);
+        }
     }