Changeset 21183 for trunk/ppMerge/src/ppMergeThreadLauncher.c

Timestamp:

Jan 26, 2009, 8:40:07 PM (17 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

File:

• trunk/ppMerge/src/ppMergeThreadLauncher.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeThreadLauncher.c

@@ -60 +60 @@
             psScalar *maskVal           = job->args->data[6];
 
-            bool status = pmDarkCombine(outCell, fileGroup->readouts, darkOrdinates, darkNorm, iter->data.S32, rej->data.F32, maskVal->data.U8);
+            bool status = pmDarkCombine(outCell, fileGroup->readouts, darkOrdinates, darkNorm, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA);
             if (!status) {
                 self->fault = true;
@@ -82 +82 @@
             psScalar *maskVal             = job->args->data[6];
 
-            bool status = pmShutterCorrectionGenerate(output, NULL, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.U8);
+            bool status = pmShutterCorrectionGenerate(output, NULL, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA);
             if (!status) {
                 self->fault = true;