Changeset 13593 for trunk/ppImage/src/ppImageOptions.c

Timestamp:

Jun 1, 2007, 6:16:29 PM (19 years ago)

Author:

Paul Price

Message:

Updating high-level programs to use symbolic names for mask values in the recipes.

File:

• trunk/ppImage/src/ppImageOptions.c (modified) (2 diffs)

trunk/ppImage/src/ppImageOptions.c

@@ -24 +24 @@
     // default flags for various activities
     options->doMask     = false;        // Mask bad pixels
-    options->maskValue  = 0xff;         // Default mask value
+    options->maskValue  = 0x00;         // Default mask value
+    options->satMask    = 0x00;         // Saturated pixels
+    options->badMask    = 0x00;         // Bad pixels
+    options->flatMask   = 0x00;         // Bad flat pixels
 
     options->doNonLin   = false;        // Non-linearity correction
@@ -163 +166 @@
     // Mask recipe options
     options->doMask = psMetadataLookupBool(NULL, recipe, "MASK");
-    psMaskType maskValue = psMetadataLookupU8(&status, recipe, "MASK.VALUE");
+    const char *masks = psMetadataLookupStr(&status, recipe, "MASK.VALUE");
     if (status) {
-        options->maskValue = maskValue;
-    }
+        options->maskValue = pmConfigMask(masks, config);
+    }
+    options->satMask = pmConfigMask("SAT", config);
+    options->badMask = pmConfigMask("BAD", config);
+    options->flatMask = pmConfigMask("FLAT", config);
+
 
     options->doBias = psMetadataLookupBool(NULL, recipe, "BIAS");