Changeset 35081 for trunk/ippconfig

Timestamp:

Feb 1, 2013, 5:01:08 PM (13 years ago)

Author:

watersc1

Message:

Merging changes that implement FPA level background continuity.

Location:

trunk/ippconfig/recipes

Files:

• filerules-mef.mdc (modified) (1 diff)
• filerules-simple.mdc (modified) (1 diff)
• filerules-split.mdc (modified) (1 diff)
• ppImage.config (modified) (2 diffs)

trunk/ippconfig/recipes/filerules-mef.mdc

@@ -214 +214 @@
 PPIMAGE.PATTERN         OUTPUT {OUTPUT}.ptn                      PATTERN   NONE       CHIP       TRUE      MEF
 PPIMAGE.STATS           OUTPUT {OUTPUT}.stats                    STATS     NONE       FPA        TRUE      MEF
-
+PPIMAGE.BACKMDL              OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits     IMAGE           NONE       CHIP       TRUE      NONE
 
 ## note: these use the same output naming convention since they are used for different ppMerge runs

trunk/ippconfig/recipes/filerules-simple.mdc

@@ -178 +178 @@
 PPIMAGE.PATTERN              OUTPUT {OUTPUT}.ptn                  PATTERN         NONE       FPA        TRUE      NONE
 PPIMAGE.STATS                OUTPUT {OUTPUT}.stats                STATS           NONE       FPA        TRUE      NONE
-
+PPIMAGE.BACKMDL              OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits     IMAGE           NONE       CHIP       TRUE      NONE
 
 ## note: these use the  same output naming convention since they are used for different ppMerge runs

trunk/ippconfig/recipes/filerules-split.mdc

@@ -198 +198 @@
 PPIMAGE.PATTERN              OUTPUT {OUTPUT}.{CHIP.NAME}.ptn          PATTERN         NONE       CHIP       TRUE      NONE
 PPIMAGE.STATS                OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE
+PPIMAGE.BACKMDL              OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits     IMAGE           NONE       CHIP       TRUE      NONE
 
 ## note: these use the  same output naming convention since they are used for different ppMerge runs

trunk/ippconfig/recipes/ppImage.config

@@ -42 +42 @@
 MASK.STATS         BOOL    FALSE           # calculate mask statistics.
 GAIN.OVERRIDE           BOOL    TRUE            # Override a non-finite gain?
-
+BACKGROUND.CONTINUITY BOOL FALSE           # Apply continuity correction to background models for an FPA.
 TILTYSTREAK.BY.CLASS METADATA              # apply the 'tiltystreak' tool
 END
@@ -1147 +1147 @@
   MASK.SATURATED   BOOL    FALSE           # DO NOT Mask the saturated pixels
   MASK.LOW         BOOL    FALSE           # DO NOT Mask the saturated pixels
+END
+
+# Calculate new background models with continuity correction applied
+PPIMAGE_BKGCONT    METADATA
+  OVERSCAN         BOOL    FALSE           # Overscan subtraction
+  NONLIN           BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS             BOOL    FALSE           # Bias subtraction
+  DARK             BOOL    FALSE           # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    FALSE           # Flat-field normalisation
+  MASK             BOOL    FALSE           # Mask bad pixels
+  MASK.BUILD       BOOL    FALSE           # Build internal mask?
+  FRINGE           BOOL    FALSE           # Fringe subtraction
+  PHOTOM           BOOL    FALSE           # Source identification and photometry
+  ASTROM.CHIP      BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
+  BASE.FITS        BOOL    FALSE           # Save base image?
+  BASE.MASK.FITS   BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS        BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    FALSE           # Save chip-mosaic-ed image? 
+  BIN1.FITS        BOOL    FALSE           # Save 1st binned chip image?
+  BIN2.FITS        BOOL    FALSE           # Save 2nd binned chip image?
+  BIN1.JPEG        BOOL    FALSE           # Save 1st binned jpeg?
+  BIN2.JPEG        BOOL    FALSE           # Save 2nd binned jpeg?
+  BIN1.XBIN        S32     1               # Image is already binned
+  BIN1.YBIN        S32     1               # Image is already binned
+  BIN2.XBIN        S32     1               # Image is already binned
+  BIN2.YBIN        S32     1               # Image is already binned
+  MASK.SATURATED   BOOL    FALSE           # DO NOT Mask the saturated pixels
+  MASK.LOW         BOOL    FALSE           # DO NOT Mask the saturated pixels
+  BACKGROUND.CONTINUITY BOOL TRUE
+  PATTERN.CONTINUITY.WIDTH S32 2
 END