Changeset 21216

Timestamp:

Jan 28, 2009, 5:11:31 PM (17 years ago)

Author:

Paul Price

Message:

Fixing mask types.

File:

• branches/pap_branch_20090128/ppImage/src/ppImageSetMaskBits.c (modified) (4 diffs)

branches/pap_branch_20090128/ppImage/src/ppImageSetMaskBits.c

@@ -7 +7 @@
 bool ppImageSetMaskBits (pmConfig *config, ppImageOptions *options) {
 
-    if (!pmConfigMaskSetBits (&options->maskValue, &options->markValue, config)) {
-        psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values");
-        return false;
+    if (!pmConfigMaskSetBits(&options->maskValue, &options->markValue, config)) {
+        psError (PS_ERR_UNKNOWN, true, "Unable to define the mask bit values");
+        return false;
     }
 
@@ -15 +15 @@
 
     // mask for non-linear flat corrections
-    options->flatMask = pmConfigMaskGet("FLAT", config); 
+    options->flatMask = pmConfigMaskGet("FLAT", config);
     psAssert (options->flatMask, "flat mask not set");
 
     // mask for non-existent data  (default to DETECTOR if not defined)
-    options->blankMask = pmConfigMaskGet("BLANK", config); 
+    options->blankMask = pmConfigMaskGet("BLANK", config);
     psAssert (options->blankMask, "blank mask not set");
 
@@ -25 +25 @@
     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);
@@ -38 +38 @@
 
     // 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);
+    psMetadataAddImageMask(recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask",
+                           options->maskValue);
+    psMetadataAddImageMask(recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "user-defined mask",
+                           options->markValue);
 
     return true;