Changeset 37415 for trunk/ippconfig

Timestamp:

Sep 19, 2014, 4:45:20 PM (12 years ago)

Author:

eugene

Message:

add gpc2 configs and ppImage recipes to support gpc2 data

Location:

trunk/ippconfig

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• recipes/ppImage.config (modified) (2 diffs)
• recipes/ppSub.config (modified) (1 prop)
• recipes/reductionClasses.mdc (modified) (2 diffs, 1 prop)
• system.config (modified) (1 diff)

trunk/ippconfig/Makefile.am

@@ -4 +4 @@
         gpc1 \
         gpc1-tdi \
+        gpc2 \
         cfh12k \
         megacam \

trunk/ippconfig/recipes/ppImage.config

@@ -571 +571 @@
   CHIP.VARIANCE.FITS BOOL    FALSE           # Save chip-mosaic-ed image? 
   OVERSCAN           BOOL    FALSE           # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    TRUE            # 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?
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+END
+
+# Dark & Overscan subtraction only
+PPIMAGE_OD          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    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    FALSE           # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
   NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
   BIAS               BOOL    FALSE           # Bias subtraction
@@ -2456 +2480 @@
 END
 
+# Overscan, bias, dark, shutter, flat-field -- use FLAT_PREMASK
+PPIMAGE_PREMASK_PROCESS      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    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?
+  BIN1.FITS        BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS        BOOL    TRUE            # Save 2nd binned chip image?
+
+  DETREND.CONSTRAINTS  METADATA
+    DARK METADATA
+      DETTYPE STR DARK_PREMASK
+      EXPTIME STR FPA.EXPOSURE
+    END
+    FLAT METADATA
+      DETTYPE STR FLAT_PREMASK
+      FILTER  STR FPA.FILTERID
+    END
+  END   
+END
+

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -1022 +1022 @@
 DETREND_ONLY            METADATA
         CHIP_PPIMAGE    STR     PPIMAGE_DET_ONLY
+        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
+        PSASTRO         STR     DEFAULT_RECIPE
+END
+
+# Detrend Processing only for raw data
+DARK_ONLY               METADATA
+        CHIP_PPIMAGE    STR     PPIMAGE_OD
         CHIP_PSPHOT     STR     CHIP
         WARP_PSWARP     STR     WARP
@@ -1298 +1314 @@
 # random user tests (may not be stable or consistent)
 TEST1 METADATA
-   STACK_PPSTACK   STR TEST1
-   STACK_PPSUB     STR STACK
-   STACK_PSPHOT    STR STACK
+#  CHIP_PPIMAGE    STR PPIMAGE_PREMASK_PROCESS
+   CHIP_PPIMAGE    STR APTEST_V1
+   CHIP_PSPHOT     STR APTEST_V1
+   PSASTRO                  STR     DEFAULT_RECIPE
+   FAKEPHOT                 STR     FAKEPHOT
+   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
+   ADDSTAR                  STR     ADDSTAR
+   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
+   PSVIDEOPHOT              STR     PSVIDEOPHOT
+   STATICSKY_CALIBRATION    STR     STATICSKY_CAL
+   FULLFORCE_PSPHOT         STR     FULLFORCE_WARP
+#   STACK_PPSTACK   STR TEST1
+#   STACK_PPSUB     STR STACK
+#   STACK_PSPHOT    STR STACK
 END
     
 TEST2 METADATA
+   CHIP_PPIMAGE    STR PPIMAGE_DET_ONLY
+   CHIP_PSPHOT     STR CHIP
    STACK_PPSTACK   STR TEST2
    STACK_PPSUB     STR STACK

trunk/ippconfig/system.config

@@ -11 +11 @@
         GPC1                    STR     gpc1/camera.config              # Pan-STARRS GPC1
         GPC1-TDI                STR     gpc1-tdi/camera.config          # Pan-STARRS GPC1 with TDI guiding
+        GPC2                    STR     gpc2/camera.config              # Pan-STARRS GPC2
         TC3                     STR     tc3/camera.config               # Pan-STARRS Test Camera III
         ESOWFI                  STR     esowfi/camera.config            # ESO Wide-Field Imager