Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpSetMaskBits.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpSetMaskBits.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpSetMaskBits.c

@@ -33 +33 @@
 
     // mask for non-linear flat regions (default to DETECTOR if not defined)
-    psImageMaskType badMask = pmConfigMaskGet("BAD.WARP", config);
+    psImageMaskType badMask = pmConfigMaskGet("CONV.BAD", config);
     if (!badMask) {
         badMask = 0x01;
-        pmConfigMaskSet (config, "BAD.WARP", badMask);
+        pmConfigMaskSet (config, "CONV.BAD", badMask);
     }
     maskOut |= badMask;
 
     // mask for non-linear flat regions (default to DETECTOR if not defined)
-    psImageMaskType poorMask = pmConfigMaskGet("POOR.WARP", config);
+    psImageMaskType poorMask = pmConfigMaskGet("CONV.POOR", config);
     if (!poorMask) {
         poorMask = 0x02;
-        pmConfigMaskSet (config, "POOR.WARP", poorMask);
+        pmConfigMaskSet (config, "CONV.POOR", poorMask);
     }
     maskOut |= poorMask;