Changeset 31913

Timestamp:

Jul 20, 2011, 3:25:36 PM (15 years ago)

Author:

watersc1

Message:

Adding darktest reduction class and correcting the recipe to use fringes as needed.

Location:

trunk/ippconfig

Files:

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

trunk/ippconfig/gpc1/ppImage.config

@@ -177 +177 @@
 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    TRUE            # apply non-linearity correction 
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  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
+  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    TRUE            # Subtract model background?
+
+  DETREND.CONSTRAINTS  METADATA
+    BIAS METADATA
+    END
+    DARK METADATA
+      DETTYPE STR DARKTEST
+      EXPTIME STR FPA.EXPOSURE
+    END
+    FLAT METADATA
+      FILTER  STR FPA.FILTERID
+    END
+    FLATCORR METADATA
+      FILTER   STR FPA.FILTERID
+    END
+    FRINGE METADATA
+      FILTER   STR FPA.FILTERID
+    END
+    SHUTTER METADATA
+    END
+    MASK METADATA
+    END 
+    ASTROM METADATA
+    END 
+    NOISEMAP METADATA
+    END
+  END   
+END
+
 CHIP_MASKTEST METADATA
    BASE.FITS          BOOL    FALSE           # Save base detrended image?
@@ -422 +476 @@
 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    TRUE            # apply non-linearity correction 
-  BIAS             BOOL    FALSE           # Bias subtraction
-  DARK             BOOL    TRUE            # Dark subtraction
-  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
-  FRINGE           BOOL    FALSE           # 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  TRUE            # Subtract model background?
-
-  DETREND.CONSTRAINTS  METADATA
-    BIAS METADATA
-    END
-    DARK METADATA
-      DETTYPE STR DARKTEST
-      EXPTIME STR FPA.EXPOSURE
-    END
-    FLAT METADATA
-      FILTER  STR FPA.FILTERID
-    END
-    FLATCORR METADATA
-      FILTER   STR FPA.FILTERID
-    END
-    FRINGE METADATA
-      FILTER   STR FPA.FILTERID
-    END
-    SHUTTER METADATA
-    END
-    MASK METADATA
-    END 
-    ASTROM METADATA
-    END 
-    NOISEMAP METADATA
-    END
-  END   
-END
 
 # Overscan, bias, dark, shutter

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -216 +216 @@
 END
 
+DEFAULT_DARKTEST        METADATA
+        CHIP_PPIMAGE      STR     CHIP_DARKTEST
+        CHIP_PSPHOT       STR     CHIP
+        WARP_PSWARP       STR     WARP
+        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     DEFAULT_RECIPE
+        STACKPHOT_PSPHOT  STR     STACKPHOT
+        STACKPHOT_PPSUB   STR     STACKPHOT
+        STACKPHOT_PPSTACK STR     STACKPHOT
+        STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
+        BACKGROUND_PPBACKGROUND STR     BACKGROUND
+        BACKGROUND_PSWARP       STR     BACKGROUND
+END
+
+
 DEFAULT_MASKTEST                METADATA
         CHIP_PPIMAGE    STR     CHIP_MASKTEST