Changeset 21183 for trunk/psphot/src/psphotGuessModels.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/psphot/src/psphotGuessModels.c (modified) (3 diffs)

trunk/psphot/src/psphotGuessModels.c

@@ -41 +41 @@
 
     // bit-masks to test for good/bad pixels
-    psMaskType maskVal = psMetadataLookupU8(&status, recipe, "MASK.PSPHOT");
+    psImageMaskType maskVal = psMetadataLookupImageMask(&status, recipe, "MASK.PSPHOT");
     assert (maskVal);
 
     // bit-mask to mark pixels not used in analysis
-    psMaskType markVal = psMetadataLookupU8(&status, recipe, "MARK.PSPHOT");
+    psImageMaskType markVal = psMetadataLookupImageMask(&status, recipe, "MARK.PSPHOT");
     assert (markVal);
 
@@ -73 +73 @@
 
             // XXX change these to use abstract mask type info
-            PS_ARRAY_ADD_SCALAR(job->args, maskVal,  PS_TYPE_U8);
-            PS_ARRAY_ADD_SCALAR(job->args, markVal,  PS_TYPE_U8);
+            PS_ARRAY_ADD_SCALAR(job->args, maskVal,  PS_TYPE_IMAGE_MASK);
+            PS_ARRAY_ADD_SCALAR(job->args, markVal,  PS_TYPE_IMAGE_MASK);
 
             if (!psThreadJobAddPending(job)) {
@@ -130 +130 @@
     pmPSF *psf         = job->args->data[2];
     
-    psMaskType maskVal = PS_SCALAR_VALUE(job->args->data[3],U8);
-    psMaskType markVal = PS_SCALAR_VALUE(job->args->data[4],U8);
+    psImageMaskType maskVal = PS_SCALAR_VALUE(job->args->data[3],PS_TYPE_IMAGE_MASK_DATA);
+    psImageMaskType markVal = PS_SCALAR_VALUE(job->args->data[4],PS_TYPE_IMAGE_MASK_DATA);
 
     int nSrc = 0;