Changeset 23505

Timestamp:

Mar 24, 2009, 5:17:30 PM (17 years ago)

Author:

Paul Price

Message:

Fixing mask names following change.

Location:

trunk

Files:

• ppSub/src/ppSubMatchPSFs.c (modified) (1 diff)
• ppSub/src/ppSubSetMasks.c (modified) (1 diff)
• pswarp/src/pswarpSetMaskBits.c (modified) (1 diff)

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -123 +123 @@
     float optThresh = psMetadataLookupF32(&mdok, recipe, "OPTIMUM.TOL"); // Tolerance for search
 
-    // XXX Do we need/want to define different values for BAD and POOR subtraction vs BAD and POOR warp?
     psImageMaskType maskVal = pmConfigMaskGet("MASK.VALUE", config); // Bits to mask in inputs
-    psImageMaskType maskPoor = pmConfigMaskGet("POOR.WARP", config); // Bits to mask for poor pixels
+    psImageMaskType maskPoor = pmConfigMaskGet("CONV.POOR", config); // Bits to mask for poor pixels
     psImageMaskType maskBad = pmConfigMaskGet("BLANK", config); // Bits to mask for bad pixels
 

trunk/ppSub/src/ppSubSetMasks.c

@@ -95 +95 @@
     float poorFrac = psMetadataLookupF32(&mdok, recipe, "POOR.FRACTION"); // Fraction for "poor"
 
-    psImageMaskType maskPoor = pmConfigMaskGet("POOR.WARP", config); // Bits to mask for poor pixels
+    psImageMaskType maskPoor = pmConfigMaskGet("CONV.POOR", config); // Bits to mask for poor pixels
     psImageMaskType maskBad = pmConfigMaskGet("BLANK", config); // Bits to mask for bad pixels
 

trunk/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;