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

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

@@ -64 +64 @@
         // pmDarkCombine
         if (!strcmp (job->type, "PPMERGE_DARK_COMBINE")) {
-            psAssert (job->args->n == 7, "invalid number of arguments to pmDarkCombine");
+            psAssert (job->args->n == 8, "invalid number of arguments to pmDarkCombine");
 
             pmCell *outCell             = job->args->data[0];
@@ -73 +73 @@
             psScalar *rej               = job->args->data[5];
             psScalar *maskVal           = job->args->data[6];
-
-            bool status = pmDarkCombine(outCell, fileGroup->readouts, darkOrdinates, darkNorm, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA);
+            int *useVariance            = job->args->data[7];
+            
+            fprintf (stderr, "%d test test \n");
+            bool status = pmDarkCombine(outCell, fileGroup->readouts, darkOrdinates, darkNorm, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA, useVariances);
             if (!status) {
                 self->fault = true;
@@ -81 +83 @@
             fileGroup->busy = false;
             self->busy = false;  
+            
+        
             continue;
         }
@@ -86 +90 @@
         // pmShutterCorrectionGenerate
         if (!strcmp (job->type, "PPMERGE_SHUTTER_CORRECTION")) {
-            psAssert (job->args->n == 7, "invalid number of arguments to pmDarkCombine");
+            psAssert (job->args->n == 8, "invalid number of arguments to pmDarkCombine");
 
             pmReadout *output             = job->args->data[0];
@@ -95 +99 @@
             psScalar *rej                 = job->args->data[5];
             psScalar *maskVal             = job->args->data[6];
+            bool *useVariances            = job->args->data[7];
 
-            bool status = pmShutterCorrectionGenerate(output, NULL, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA);
+            bool status = pmShutterCorrectionGenerate(output, NULL, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA, useVariances);
             if (!status) {
                 self->fault = true;