Changeset 13593 for trunk/ppImage/src

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/ppImage/src

Files:

• ppImageDetrendReadout.c (modified) (2 diffs)
• ppImageOptions.c (modified) (2 diffs)
• ppImageOptions.h (modified) (1 diff)

trunk/ppImage/src/ppImageDetrendReadout.c

@@ -18 +18 @@
     // Masking on the basis of pixel value needs to be done before anything else, so the values are pristine.
     if (options->doMask || options->doShutter || options->doFlat || options->doPhotom) {
-        pmReadoutGenerateMask(input);
+        pmReadoutGenerateMask(input, options->satMask, options->badMask);
     }
     // apply the externally supplied mask to the input->mask pixels
@@ -68 +68 @@
     if (options->doFlat) {
         pmReadout *flat = pmFPAfileThisReadout(config->files, detview, "PPIMAGE.FLAT");
-        if (!pmFlatField(input, flat)) {
+        if (!pmFlatField(input, flat, options->flatMask)) {
             return false;
         }

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");

trunk/ppImage/src/ppImageOptions.h

@@ -6 +6 @@
     bool doMask;                        // Mask bad pixels
     psMaskType maskValue;               // apply this bit-mask to choose masked bits
+    psMaskType satMask;                 // Mask value to give saturated pixels
+    psMaskType badMask;                 // Mask value to give bad pixels
+    psMaskType flatMask;                // Mask value to give bad flat pixels
 
     bool doBias;                        // Bias subtraction