Changeset 29008 for branches/haf_branches/ppMerge2010/ppMerge/src/ppMergeLoop.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/ppMergeLoop.c (modified) (2 diffs)

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

@@ -307 +307 @@
             psTimerStart("ppMergeLoop");
             for (int numChunk = 0; true; numChunk++) {
-
+              //int *intVariance =0;
                 bool status = false;
                 fileGroup = ppMergeReadChunk(&status, fileGroups, config, numChunk);
@@ -348 +348 @@
                       psArrayAdd(job->args, 1, psScalarAlloc(iter, PS_TYPE_S32));
                       psArrayAdd(job->args, 1, psScalarAlloc(rej, PS_TYPE_F32));
-                      psArrayAdd(job->args, 1, psScalarAlloc(maskVal, PS_TYPE_IMAGE_MASK));
-
+                      
+                      psArrayAdd(job->args, 1, psScalarAlloc(maskVal, PS_TYPE_IMAGE_MASK));
+                     
+                      psArrayAdd(job->args, 1, psScalarAlloc(useVariances, PS_TYPE_S8)); 
+                
                       // call: pmDarkCombine(outCell, fileGroup->readouts, iter, rej, maskVal);
                       if (!psThreadJobAddPending(job)) {