Changeset 21183 for trunk/ppMerge/src/ppMergeSetThreads.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/ppMergeSetThreads.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeSetThreads.c

@@ -29 +29 @@
     psScalar *maskVal           = job->args->data[4];
 
-    bool status = pmDarkCombine(outCell, fileGroup->readouts, iter->data.S32, rej->data.F32, maskVal->data.U8);
+    bool status = pmDarkCombine(outCell, fileGroup->readouts, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA);
 
     // after we are done, tell the I/O system that this file group is done
@@ -49 +49 @@
     psScalar *maskVal             = job->args->data[7];
 
-    bool status = pmShutterCorrectionGenerate(output, pattern, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.U8);
+    bool status = pmShutterCorrectionGenerate(output, pattern, fileGroup->readouts, shutterRef->data.F32, data, iter->data.S32, rej->data.F32, maskVal->data.PS_TYPE_IMAGE_MASK_DATA);
 
     // after we are done, tell the I/O system that this file group is done