Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageSetMaskBits.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppImage (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• ppImage/src/ppImageSetMaskBits.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/ppImage/src

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/ppImage/src/ppImageSetMaskBits.c

@@ -14 +14 @@
     // at this point we know we have valid values for required entries SAT, BAD, FLAT, BLANK:
 
-    // mask for non-linear flat corrections
+    // mask for bad flat corrections
     options->flatMask = pmConfigMaskGet("FLAT", config);
     psAssert (options->flatMask, "flat mask not set");
+
+    // mask for bad dark corrections
+    options->darkMask = pmConfigMaskGet("DARK", config);
+    psAssert (options->darkMask, "dark mask not set");
 
     // mask for non-existent data  (default to DETECTOR if not defined)
@@ -27 +31 @@
 
     // mask for below-range data  (default to RANGE if not defined)
-    options->badMask = pmConfigMaskGet("BAD", config);
-    psAssert (options->badMask, "bad mask not set");
+    options->lowMask = pmConfigMaskGet("LOW", config);
+    if (!options->lowMask) {
+        // look up old name for backward compatability
+        options->lowMask = pmConfigMaskGet("BAD", config);
+    }
+    psAssert (options->lowMask, "low mask not set");
 
     // save MASK and MARK on the PSPHOT recipe

@@ -9 +9 @@
 stamp-h1
 .libs
+ppImageVersionDefinitions.h