Changeset 13593 for trunk/ppMerge

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.

Location:

trunk/ppMerge/src

Files:

• ppMergeCombine.c (modified) (1 diff)
• ppMergeOptions.c (modified) (5 diffs)
• ppMergeOptions.h (modified) (1 diff)

trunk/ppMerge/src/ppMergeCombine.c

@@ -165 +165 @@
                         // If the mask value is set, we want to generate a mask
                         if (options->combine->maskVal) {
-                            pmReadoutSetMask(stack->data[i]);
+                            pmReadoutSetMask(stack->data[i], options->satMask, options->badMask);
                         }
 

trunk/ppMerge/src/ppMergeOptions.c

@@ -59 +59 @@
     options->combine->maskVal = 0xff;
     options->combine->weights = false;
+    options->satMask = 0x00;
+    options->badMask = 0x00;
 
     return options;
@@ -141 +143 @@
     OPTION_PARSE(options->combine->fracLow,  recipe, "FRACLOW",        F32);
     OPTION_PARSE(options->combine->nKeep,    recipe, "NKEEP",          S32);
-    OPTION_PARSE(options->combine->maskVal,  recipe, "MASKVAL",        S32);
     OPTION_PARSE(options->combine->weights,  recipe, "WEIGHTS",        Bool);
     OPTION_PARSE(options->fringeNum,         recipe, "FRINGE.NUM",     S32);
@@ -153 +154 @@
     OPTION_PARSE(options->maskBad,           recipe, "MASK.BAD",       F32);
 
+    const char *masks = psMetadataLookupStr(NULL, recipe, "MASKVAL");
+    options->combine->maskVal = pmConfigMask(masks, config);
+
     options->combine->combine = parseStat(recipe, "COMBINE");
     options->mean             = parseStat(recipe, "MEAN");
@@ -238 +242 @@
     }
 
-
 #if 0
     // Or you can set them individually
@@ -249 +252 @@
     OPTION_PARSE(options->onOff, config->arguments, "-onoff", S32);
 
+    // Masking options
+    options->satMask = pmConfigMask("SAT", config);
+    options->badMask = pmConfigMask("BAD", config);
+
     return options;
 }

trunk/ppMerge/src/ppMergeOptions.h

@@ -39 +39 @@
     ppOnOff onOff;                      // On/off pairs?
     pmCombineParams *combine;           // Combination parameters
+    psMaskType satMask;                 // Mask value for saturated pixels
+    psMaskType badMask;                 // Mask value for bad (low) pixels
 } ppMergeOptions;