Changeset 23535

Timestamp:

Mar 25, 2009, 3:26:30 PM (17 years ago)

Author:

bills

Message:

look up mask with new name "LOW" if not found
look up "BAD" (for backward compatability)

Location:

trunk

Files:

• ppImage/src/ppImageSetMaskBits.c (modified) (1 diff)
• ppSub/src/ppSubSetMasks.c (modified) (3 diffs)
• psModules/src/camera/pmFPARead.c (modified) (1 diff)
• psphot/src/psphotMaskReadout.c (modified) (1 diff)

trunk/ppImage/src/ppImageSetMaskBits.c

@@ -28 +28 @@
     // mask for below-range data  (default to RANGE if not defined)
     options->badMask = pmConfigMaskGet("LOW", config);
+    if (!options->badMask) {
+        // XXX look up old name for backward compatability
+        options->badMask = pmConfigMaskGet("BAD", config);
+    }
     psAssert (options->badMask, "low mask not set");
 

trunk/ppSub/src/ppSubSetMasks.c

@@ -43 +43 @@
     psAssert(satValue, "SAT must be non-zero");
 
-    psImageMaskType badValue = pmConfigMaskGet("BAD", config);
-    psAssert(badValue, "BAD must be non-zero");
+    psImageMaskType lowValue = pmConfigMaskGet("LOW", config);
+    if (!lowValue) {
+        // Look up old name for backward compatability
+        lowValue = pmConfigMaskGet("BAD", config);
+    }
+    psAssert(lowValue, "LOW or BAD must be non-zero");
 
     // input images
@@ -58 +62 @@
     if (!inRO->mask) {
         if (psMetadataLookupBool(NULL, recipe, "MASK.GENERATE")) {
-            pmReadoutSetMask(inRO, satValue, badValue);
+            pmReadoutSetMask(inRO, satValue, lowValue);
         } else {
             inRO->mask = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);
@@ -66 +70 @@
     if (!refRO->mask) {
         if (psMetadataLookupBool(NULL, recipe, "MASK.GENERATE")) {
-            pmReadoutSetMask(refRO, satValue, badValue);
+            pmReadoutSetMask(refRO, satValue, lowValue);
         } else {
             refRO->mask = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);

trunk/psModules/src/camera/pmFPARead.c

@@ -554 +554 @@
           }
           psFree(header);
-          bad = pmConfigMaskGet("BAD", config);
+          bad = pmConfigMaskGet("LOW", config);
+          if (!bad) {
+              // XXX look up old name for compatability
+              bad = pmConfigMaskGet("BAD", config);
+          }
           break;
       }

trunk/psphot/src/psphotMaskReadout.c

@@ -12 +12 @@
     psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MASK.SAT", PS_META_REPLACE, "user-defined mask", maskSat);
 
-    psImageMaskType maskBad  = pmConfigMaskGet("BAD", config); // Mask value for bad pixels
+    psImageMaskType maskBad  = pmConfigMaskGet("LOW", config); // Mask value for low pixels
+    if (!maskBad) {
+        // XXX: for backward compatability look up old name
+        maskBad  = pmConfigMaskGet("BAD", config);
+    }
     psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MASK.BAD", PS_META_REPLACE, "user-defined mask", maskBad);