Changeset 21090 for branches/eam_branch_20081230/ppStack/src/ppStackPhotometry.c

Timestamp:

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

Author:

eugene

Message:

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

File:

• branches/eam_branch_20081230/ppStack/src/ppStackPhotometry.c (modified) (3 diffs)

branches/eam_branch_20081230/ppStack/src/ppStackPhotometry.c

@@ -45 +45 @@
         return false;
     }
-    psMaskType maskVal = pmConfigMaskGet(maskValStr, config); // Bits to mask
+    psImageMaskType maskVal = pmConfigMaskGet(maskValStr, config); // Bits to mask
 
     psImage *image = ro->image, *mask = ro->mask; // Image and mask from readout
@@ -85 +85 @@
             float dy2 = PS_SQR(y - v); // Distance from centroid
             for (int u = xMin; u <= xMax; u++) {
-                if (mask->data.PS_TYPE_MASK_DATA[v][u] & maskVal) {
+                if (mask->data.PS_TYPE_IMAGE_MASK_DATA[v][u] & maskVal) {
                     numBadPix++;
                     continue;
@@ -133 +133 @@
 
     // set maskValue and markValue in the psphot recipe
-    psMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
-    psMaskType markValue = pmConfigMaskGet("MARK.VALUE", config); // Bits to use for marking
-    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "Bits to mask", maskValue);
-    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "Bits to use for mark", markValue);
+    psImageMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
+    psImageMaskType markValue = pmConfigMaskGet("MARK.VALUE", config); // Bits to use for marking
+    psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "Bits to mask", maskValue);
+    psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "Bits to use for mark", markValue);
 
     if (!psphotReadout(config, view)) {