Changeset 41195 for trunk/ippconfig/recipes/ppImage.config

Timestamp:

Dec 4, 2019, 8:00:05 PM (7 years ago)

Author:

fairlamb

Message:

Reintegration merge to trunk

Location:

trunk/ippconfig

Files:

• . (modified) (1 prop)
• recipes/ppImage.config (modified) (3 diffs)

trunk/ippconfig/recipes/ppImage.config

@@ -244 +244 @@
 
 # Standard chip processing
-CHIP    METADATA
+CHIP  METADATA
   BASE.FITS          BOOL    FALSE           # Save base detrended image?
   BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
@@ -370 +370 @@
 END
 
+# Chip processing with DARKTEST 
+CHIP_DARKTEST 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.
+
+  DETREND.CONSTRAINTS  METADATA
+    DARK METADATA
+      DETTYPE STR DARKTEST
+      EXPTIME STR FPA.EXPOSURE
+    END
+  END
+END
+
 #standard processing, testing new mask
-
 CHIP_MASKTEST METADATA
   BASE.FITS          BOOL    FALSE           # Save base detrended image?
@@ -908 +939 @@
     DARK METADATA
       DETTYPE STR DARK_PREMASK
-      EXPTIME STR FPA.EXPOSURE
-    END
-  END   
-END
-
-# Chip processing with DARKTEST 
-CHIP_DARKTEST 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?
-
-  DETREND.CONSTRAINTS  METADATA
-    DARK METADATA
-      DETTYPE STR DARKTEST
       EXPTIME STR FPA.EXPOSURE
     END