Changeset 29008 for branches/haf_branches/ppMerge2010/ppMerge/src/ppMergeSetThreads.c

Timestamp:

Aug 20, 2010, 3:25:06 PM (16 years ago)

Author:

heather

Message:

ppMerge changes (to add variances)

File:

• branches/haf_branches/ppMerge2010/ppMerge/src/ppMergeSetThreads.c (modified) (2 diffs)

branches/haf_branches/ppMerge2010/ppMerge/src/ppMergeSetThreads.c

@@ -40 +40 @@
     psScalar *rej               = job->args->data[3];
     psScalar *maskVal           = job->args->data[4];
+    psScalar *useVariances      = job->args->data[5];
 
-    bool status = pmDarkCombine(outCell, fileGroup->readouts, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA);
+    
+    bool status = pmDarkCombine(outCell, fileGroup->readouts, iter->data.S32, 
+rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA, useVariances->data.S8);
 
     // after we are done, tell the I/O system that this file group is done
@@ -79 +82 @@
 
     {
-        psThreadTask *task = psThreadTaskAlloc("PPMERGE_DARK_COMBINE", 5);
+        psThreadTask *task = psThreadTaskAlloc("PPMERGE_DARK_COMBINE", 6);
         task->function = &ppMergeThread_pmDarkCombine;
         psThreadTaskAdd(task);