Changeset 21087 for branches/eam_branch_20081230/ppMerge/src/ppMergeThreadLauncher.c

Timestamp:

Jan 6, 2009, 7:13:34 AM (18 years ago)

Author:

eugene

Message:

update to psImageMaskType and associated (psphot, psastro, ppImage, ppMerge, ppSim, ppStats, ppArith)

File:

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

branches/eam_branch_20081230/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;