Changeset 13592

Timestamp:

Jun 1, 2007, 6:05:03 PM (19 years ago)

Author:

Paul Price

Message:

Adding masks.config, to provide mask values.

Location:

trunk/ippconfig

Files:

• ipprc.config.in (modified) (1 diff)
• recipes/masks.config (added)
• recipes/ppImage.config (modified) (1 diff)
• recipes/ppMerge.config (modified) (4 diffs)
• recipes/ppStack.config (modified) (1 diff)
• recipes/ppStats.config (modified) (2 diffs)
• recipes/ppSub.config (modified) (1 diff)
• recipes/pswarp.config (modified) (1 diff)

trunk/ippconfig/ipprc.config.in

@@ -63 +63 @@
 
 RECIPES         METADATA                # Site-level recipes
+        MASKS           STR             recipes/masks.config    # Mask values
         PPIMAGE         STR             recipes/ppImage.config  # Image reduction
         PPMERGE         STR             recipes/ppMerge.config  # Image combination

trunk/ippconfig/recipes/ppImage.config

@@ -11 +11 @@
 FLAT            BOOL    TRUE            # Flat-field normalisation
 MASK            BOOL    FALSE           # Mask bad pixels
-MASK.VALUE      U8      0xff            # only mask pixels matching this bitmask
+MASK.VALUE      STR     SAT,BAD         # Mask pixels with these attributes
 FRINGE          BOOL    FALSE           # Fringe subtraction
 PHOTOM          BOOL    FALSE           # Source identification and photometry

trunk/ippconfig/recipes/ppMerge.config

@@ -19 +19 @@
 MASK.SUSPECT    F32     5.0             # Threshold for suspect pixels (sigma)
 MASK.BAD        F32     -4.0            # Threshold for bad pixels (sigma)
-MASKVAL         S32     0xff            # Mask value for input data
+MASKVAL         STR     SAT,BAD         # Mask value for input data
 COMBINE         STR     CLIPPED         # Statistic to use for combination
 MEAN            STR     ROBUST_MEDIAN   # Statistic to use to measure the mean
@@ -32 +32 @@
         FRACLOW         F32     0.0             # Fraction of low pixels to reject immediately
         WEIGHTS         BOOL    FALSE           # Use image weights?
-        MASKVAL         S32     0               # Mask value for input data
         COMBINE         STR     CLIPPED         # Statistic to use for combination: 
 END
@@ -45 +44 @@
         FRACLOW         F32     0.0             # Fraction of low pixels to reject immediately
         WEIGHTS         BOOL    FALSE           # Use image weights?
-        MASKVAL         S32     0               # Mask value for input data
         COMBINE         STR     CLIPPED         # Statistic to use for combination: 
 END
@@ -56 +54 @@
         FRACLOW         F32     0.1             # Fraction of low pixels to reject immediately
         NKEEP           S32     5               # Minimum number of pixels in stack to keep
-        MASKVAL         S32     0xff            # Mask value for input data
         WEIGHTS         BOOL    TRUE            # Use image weights?
         COMBINE         STR     MEAN            # Statistic to use for combination: 

trunk/ippconfig/recipes/ppStack.config

@@ -5 +5 @@
 CONVOLVE.REJ    F32     10.0            # Rejection threshold in convolution (sigma)
 EXTENT          F32     3.0             # Extent of Gaussian convolution (sigma)
-MASK.BAD        U8      0x0f            # Mask value of bad pixels
-MASK.BLANK      U8      0xf0            # Mask value to give blank pixels
+MASK.BAD        U8      SAT,BAD         # Mask value of bad pixels
+MASK.BLANK      U8      BLANK           # Mask value to give blank pixels

trunk/ippconfig/recipes/ppStats.config

@@ -3 +3 @@
 # Options governing statistics
 SAMPLE          F32     0.1     # Fraction of cell to sample
-MASKVAL         U8      0xff    # Mask value to use for statistics
+MASKVAL         STR     SAT,BAD # Mask value to use for statistics
 
 # Define the outputs as MULTI
@@ -18 +18 @@
 
 ### ppStats recipe for Phase 0
-PPSTATS_PHASE0  METADATA
+PPSTATS_REGISTER  METADATA
 
   # Options governing statistics
   SAMPLE        F32     0.1     # Fraction of cell to sample
-  MASKVAL       U8      0xff    # Mask value to use for statistics
+  MASKVAL       STR     SAT,BAD # Mask value to use for statistics
 
   # Define the outputs as MULTI

trunk/ippconfig/recipes/ppSub.config

@@ -9 +9 @@
 ITER            S32     10              # Number of rejection iterations
 REJ             F32     2.5             # Rejection level (std dev)
-MASK.BAD        U8      0xff            # Mask value for bad pixels
-MASK.BLANK      U8      0xff            # Mask value to give blank pixels
+MASK.BAD        STR     BAD,SAT         # Mask value for bad pixels
+MASK.BLANK      STR     BLANK           # Mask value to give blank pixels
 @ISIS.WIDTHS    F32     0.7 1.5 3       # Gaussian widths for ISIS kernels
 @ISIS.ORDERS    S32     6 4 2           # Polynomial orders for ISIS kernels

trunk/ippconfig/recipes/pswarp.config

@@ -4 +4 @@
 GRID.NY                 S32     128             # Iso-astrom grid size in y (pixels)
 INTERPOLATION.MODE      STR     LANCZOS3        # Interpolation mode to use
-MASK.IN                 U8      0               # Mask for input data
-MASK.POOR               U8      0x40            # Mask for "poor" warped data
-MASK.BAD                U8      0x80            # Mask for bad warped data
+MASK.IN                 STR     BAD,SAT         # Mask for input data
+MASK.POOR               STR     SUSPECT         # Mask for "poor" warped data
+MASK.BAD                STR     BLANK           # Mask for bad warped data
 POOR.FRAC               F32     0.01            # Max fraction of bad flux for a "poor" warped pixel