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

Timestamp:

Feb 13, 2009, 1:53:56 PM (17 years ago)

Author:

Paul Price

Message:

Using covariance factor to set the correct variance level for the combination. Adding additional recipe parameter to provide the fraction of values to discard when performing a 'olympic weighted mean'.

File:

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

trunk/ppStack/src/ppStackThread.c

@@ -49 +49 @@
 ppStackThreadData *ppStackThreadDataSetup(const psArray *cells, const psArray *imageNames,
                                           const psArray *maskNames, const psArray *varianceNames,
-                                          const pmConfig *config)
+                                          const psArray *covariances, const pmConfig *config)
 {
     PS_ASSERT_ARRAY_NON_NULL(cells, NULL);
@@ -55 +55 @@
     PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, maskNames, NULL);
     PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, varianceNames, NULL);
+    PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, covariances, NULL);
 
     ppStackThreadData *stack = psAlloc(sizeof(ppStackThreadData)); // Thread data, to return
@@ -98 +99 @@
                 continue;
             }
-            readouts->data[j] = pmReadoutAlloc(cell);
+            pmReadout *ro = pmReadoutAlloc(cell); // Readout for thread
+            ro->covariance = psMemIncrRefCounter(covariances->data[j]);
+            readouts->data[j] = ro;
         }
         threads->data[i] = ppStackThreadAlloc(readouts);
@@ -236 +239 @@
 
     {
-        psThreadTask *task = psThreadTaskAlloc("PPSTACK_INITIAL_COMBINE", 7);
+        psThreadTask *task = psThreadTaskAlloc("PPSTACK_INITIAL_COMBINE", 6);
         task->function = &ppStackReadoutInitialThread;
         psThreadTaskAdd(task);
@@ -250 +253 @@
 
     {
-        psThreadTask *task = psThreadTaskAlloc("PPSTACK_FINAL_COMBINE", 5);
+        psThreadTask *task = psThreadTaskAlloc("PPSTACK_FINAL_COMBINE", 7);
         task->function = &ppStackReadoutFinalThread;
         psThreadTaskAdd(task);