Changeset 36111

Timestamp:

Sep 11, 2013, 1:43:09 PM (13 years ago)

Author:

bills

Message:

turn off auxiliary masking for STS_DATASET
add reduction STS_DATASET_NOCOMPRESS and ppImage recipe CHIP_NOCOMPRESS

Location:

trunk/ippconfig

Files:

• gpc1/ppImage.config (modified) (1 diff)
• recipes/ppImage.config (modified) (1 diff)
• recipes/reductionClasses.mdc (modified) (2 diffs)

trunk/ippconfig/gpc1/ppImage.config

@@ -187 +187 @@
   BACKGROUND         BOOL    TRUE            # Subtract background?
   CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
+END
+
+CHIP_NOCOMPRESS METADATA
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    TRUE            # apply non-linearity correction 
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  NOISEMAP           BOOL    TRUE            
+  REMNANCE           BOOL    FALSE           # Remnance masking
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  MASK.BUILD         BOOL    TRUE            # Build internal mask?
+  MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  MASK.AUXMASK       BOOL    FALSE           # augment mask with more restrictive auxiliary mask
+  PATTERN.ROW        BOOL    TRUE            # Row pattern correction
+  PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
+  PATTERN.CONTINUITY BOOL    TRUE            # Cell pattern correction using edge continuity
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
+  NO.COMPRESS        BOOL    TRUE            # do not compress images
 END
 

trunk/ippconfig/recipes/ppImage.config

@@ -193 +193 @@
   BACKGROUND         BOOL    TRUE            # Subtract background?
   MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
+END
+# Standard chip processing
+CHIP_NOCOMPRESS METADATA
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    TRUE            # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
+  NO.COMPRESS        BOOL    TRUE
 END
 

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -1126 +1126 @@
 
 STS_DATASET METADATA
-   CHIP_PPIMAGE STR CHIP_AUXMASK
+   # CHIP_PPIMAGE STR CHIP_AUXMASK
+   # MPG wants auxiliary masking off for now
+   CHIP_PPIMAGE STR CHIP
    CHIP_PSPHOT STR CHIP
    WARP_PSWARP STR WARP
@@ -1142 +1144 @@
 END
 
+STS_DATASET_NOCOMPRESS METADATA
+   CHIP_PPIMAGE STR CHIP_NOCOMPRESS
+   CHIP_PSPHOT STR CHIP
+   WARP_PSWARP STR WARP_NOCOMPRESS
+   STACK_PPSTACK   STR STACK
+   STACK_PPSUB STR STACK
+   STACK_PSPHOT    STR STACK
+   DIFF_PPSUB  STR DIFF
+   DIFF_PSPHOT STR DIFF
+   JPEG_BIN1   STR PPIMAGE_J1
+   JPEG_BIN2   STR PPIMAGE_J2
+   FAKEPHOT    STR FAKEPHOT
+   ADDSTAR     STR ADDSTAR
+   PSASTRO    STR STS_DATASET
+   STACKPHOT       STR     STACKPHOT
+END
+
 M31_BG_SUBTRACT         METADATA
         CHIP_PPIMAGE      STR     CHIP_AUXMASK