Changeset 18472 for branches/eam_branch_20080706/ppImage/src/ppImageSetMaskBits.c

Timestamp:

Jul 11, 2008, 8:35:04 AM (18 years ago)

Author:

eugene

Message:

total overhaul of mask handling

File:

• branches/eam_branch_20080706/ppImage/src/ppImageSetMaskBits.c (modified) (1 diff)

branches/eam_branch_20080706/ppImage/src/ppImageSetMaskBits.c

@@ -7 +7 @@
 bool ppImageSetMaskBits (pmConfig *config, ppImageOptions *options) {
 
-    // Mask recipe options
-    const char *masks = psMetadataLookupStr(&status, recipe, "MASK.VALUE");
-    if (status) {
-        options->maskValue = pmConfigMask(masks, config);
+    if (!pmConfigMaskSetBits (&options->maskValue, &options->markValue, config)) {
+        psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values");
+        return false;
     }
 
-    darkMask           = pmConfigMask("DARK",     config);
-    options->flatMask  = pmConfigMask("FLAT",     config);
-    options->blankMask = pmConfigMask("BLANK",    config);
-    detectorMask       = pmConfigMask("DETECTOR", config);
+    // at this point we know we have valid values for required entries SAT, BAD, FLAT, BLANK:
 
-    options->satMask   = pmConfigMask("SAT",      config);
-    options->badMask   = pmConfigMask("BAD",      config);
+    // mask for non-linear flat corrections
+    options->flatMask = pmConfigMaskGet("FLAT", config); 
+    psAssert (options->flatMask, "flat mask not set");
 
-    rangeMask          = pmConfigMask("RANGE",    config);
+    // mask for non-existent data  (default to DETECTOR if not defined)
+    options->blankMask = pmConfigMaskGet("BLANK", config); 
+    psAssert (options->blankMask, "blank mask not set");
 
-    crMask             = pmConfigMask("CR",       config);
-    ghostMask          = pmConfigMask("GHOST",    config);
+    // mask for saturated data  (default to RANGE if not defined)
+    options->satMask = pmConfigMaskGet("SAT", config);
+    psAssert (options->satMask, "sat mask not set");
+    
+    // mask for below-range data  (default to RANGE if not defined)
+    options->badMask = pmConfigMaskGet("BAD", config);
+    psAssert (options->badMask, "bad mask not set");
 
-    // XXX it should be an error for these to not exist
-    if (!options->flatMask) {
-      psWarning ("FLAT MASK is not set");
+    // save MASK and MARK on the PSPHOT recipe
+    psMetadata *recipe = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+    if (!recipe) {
+        psError(PSPHOT_ERR_CONFIG, false, "missing recipe %s", PSPHOT_RECIPE);
+        return false;
     }
-    if (!options->flatMask) {
-      psWarning ("FLAT MASK is not set");
-    }
+
+    // set maskValue and markValue in the psphot recipe
+    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", options->maskValue);
+    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "user-defined mask", options->markValue);
 
     return true;