Changeset 18513 for branches/eam_branch_20080706/pswarp/src/pswarpPixelFraction.c

Timestamp:

Jul 14, 2008, 2:44:27 PM (18 years ago)

Author:

eugene

Message:

rework to use new masking bit names

File:

• branches/eam_branch_20080706/pswarp/src/pswarpPixelFraction.c (modified) (2 diffs)

branches/eam_branch_20080706/pswarp/src/pswarpPixelFraction.c

@@ -28 +28 @@
     PS_ASSERT_METADATA_NON_NULL(config->arguments, false);
 
+    bool status; 
+
     float minFrac = psMetadataLookupF32(NULL, config->arguments, "ACCEPT.FRAC"); // Minimum fraction
-    psMaskType maskPoor = psMetadataLookupU8(NULL, config->arguments, "MASK.POOR"); // Mask for "poor" data
-    psMaskType maskBad = psMetadataLookupU8(NULL, config->arguments, "MASK.BAD"); // Mask for bad data
-    psMaskType maskVal = maskPoor | maskBad; // Mask to apply
+
+    // load the recipe
+    psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
+    if (!recipe) {
+        psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
+        return false;
+    }
+
+    // output mask bits
+    psMaskType maskValue = psMetadataLookupU8(&status, recipe, "MASK.OUTPUT"); 
+    psAssert (status, "MASK.OUTPUT was not defined");
 
     psImage *image = readout->image;    // Image of interest
@@ -45 +55 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            if (mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal) {
+            if (mask->data.PS_TYPE_MASK_DATA[y][x] & maskValue) {
                 numBad++;
             } else {