Changeset 21090 for branches/eam_branch_20081230/ppSub/src/ppSubBackground.c

Timestamp:

Jan 7, 2009, 6:43:53 PM (18 years ago)

Author:

eugene

Message:

mask modifications for Image and Vector mask types (ppSim, ppStack, ppSub, pswarp, psphot)

File:

• branches/eam_branch_20081230/ppSub/src/ppSubBackground.c (modified) (3 diffs)

branches/eam_branch_20081230/ppSub/src/ppSubBackground.c

@@ -30 +30 @@
 
     psString maskBadStr = psMetadataLookupStr(NULL, ppSubRecipe, "MASK.BAD"); // Name of bits to mask for bad
-    psMaskType maskBad = pmConfigMaskGet(maskBadStr, config); // Bits to mask for bad pixels
+    psImageMaskType maskBad = pmConfigMaskGet(maskBadStr, config); // Bits to mask for bad pixels
 
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
-    psMetadataAddU8(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskBad);
+    psMetadataAddImageMask(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskBad);
 
     psImage *image = ro->image, *mask = ro->mask; // Image and mask of interest
@@ -59 +59 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            if (mask && mask->data.PS_TYPE_MASK_DATA[y][x] & maskBad) {
+            if (mask && mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskBad) {
                 image->data.F32[y][x] = 0.0;
             } else {
@@ -65 +65 @@
                 if (!isfinite(value)) {
                     image->data.F32[y][x] = NAN;
-                    mask->data.PS_TYPE_MASK_DATA[y][x] |= maskBad;
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskBad;
                 } else {
                     image->data.F32[y][x] -= value;