Changeset 33948 for branches/eam_branches/ipp-20120405/ippconfig

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/ippconfig

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• cfh12k/camera.config (modified) (1 diff)
• configure.ac (modified) (1 diff)
• esowfi/camera.config (modified) (1 diff)
• gpc1-tdi (copied) (copied from trunk/ippconfig/gpc1-tdi )
• gpc1-tdi/Makefile.am (copied) (copied from trunk/ippconfig/gpc1-tdi/Makefile.am )
• gpc1-tdi/camera.config (copied) (copied from trunk/ippconfig/gpc1-tdi/camera.config )
• gpc1-tdi/format_tdi_20120416.config (copied) (copied from trunk/ippconfig/gpc1-tdi/format_tdi_20120416.config )
• gpc1/ghost.model.mdc (modified) (2 diffs)
• gpc1/ppImage.config (modified) (1 diff)
• gpc1/psastro.config (modified) (4 diffs)
• isp/camera.config (modified) (1 diff)
• lulin/camera.config (modified) (1 diff)
• megacam/camera.config (modified) (1 diff)
• mosaic2/camera.config (modified) (1 diff)
• recipes/filerules-mef.mdc (modified) (1 diff)
• recipes/filerules-simple.mdc (modified) (1 diff)
• recipes/filerules-split.mdc (modified) (2 diffs)
• recipes/ppImage.config (modified) (1 diff)
• recipes/psastro.config (modified) (1 diff)
• recipes/psphot.config (modified) (5 diffs)
• recipes/reductionClasses.mdc (modified) (3 diffs, 1 prop)
• sdssmosaic/camera.config (modified) (1 diff)
• simmosaic/camera.config (modified) (1 diff)
• simple/camera.config (modified) (1 diff)
• ssp/camera.config (modified) (1 diff)
• ssp/format.config (modified) (1 diff)
• system.config (modified) (1 diff)
• tek/camera.config (modified) (1 diff)
• uh8k/camera.config (modified) (1 diff)
• vysos20/camera.config (modified) (1 diff)
• vysos5/camera.config (modified) (1 diff)

branches/eam_branches/ipp-20120405/ippconfig/Makefile.am

@@ -3 +3 @@
         isp \
         gpc1 \
+        gpc1-tdi \
         cfh12k \
         megacam \

branches/eam_branches/ipp-20120405/ippconfig/cfh12k/camera.config

@@ -122 +122 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/configure.ac

@@ -14 +14 @@
   isp/Makefile
   gpc1/Makefile
+  gpc1-tdi/Makefile
   cfh12k/Makefile
   megacam/Makefile

branches/eam_branches/ipp-20120405/ippconfig/esowfi/camera.config

@@ -89 +89 @@
   CMF.XSRC   STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT   STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD   STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/gpc1/ghost.model.mdc

@@ +1 @@
+# Original center models
+# GHOST.CENTER.X METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64 -4.421024e+01
+#   VAL_X01_Y00  F64 1.216270e-02
+#   VAL_X02_Y00  F64 -9.721643e-08
+#   VAL_X03_Y00  F64 9.976554e-11
+#   VAL_X00_Y01  F64 -1.762476e-03
+#   VAL_X01_Y01  F64 1.247212e-07
+#   VAL_X02_Y01  F64 3.629557e-11
+#   VAL_X00_Y02  F64 -1.040174e-07
+#   VAL_X01_Y02  F64 1.074674e-10
+#   VAL_X00_Y03  F64 1.564112e-11
+#   NELEMENTS  S32 10
+# END
+
+# GHOST.CENTER.Y METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64 -2.189470e+00
+#   VAL_X01_Y00  F64 -4.186514e-03
+#   VAL_X02_Y00  F64 1.131554e-07
+#   VAL_X03_Y00  F64 1.415192e-11
+#   VAL_X00_Y01  F64 1.569104e-02
+#   VAL_X01_Y01  F64 -1.782801e-07
+#   VAL_X02_Y01  F64 8.179602e-11
+#   VAL_X00_Y02  F64 2.577055e-07
+#   VAL_X01_Y02  F64 8.879423e-11
+#   VAL_X00_Y03  F64 5.767429e-11
+#   NELEMENTS  S32 10
+# END
+
+# Updated models of 2012-05-07
+# Corrected(?) parity
+# GHOST.CENTER.X METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64  3.314569e+01
+#   VAL_X01_Y00  F64  1.110664e-02
+#   VAL_X02_Y00  F64 -1.904158e-07
+#   VAL_X03_Y00  F64  8.470224e-11
+#   VAL_X00_Y01  F64 -1.616877e-03
+#   VAL_X01_Y01  F64  1.646508e-07
+#   VAL_X02_Y01  F64  5.623381e-11
+#   VAL_X00_Y02  F64 -2.342888e-07
+#   VAL_X01_Y02  F64  1.023761e-10
+#   VAL_X00_Y03  F64  2.836980e-11
+#   NELEMENTS  S32 10
+# END
+
+# GHOST.CENTER.Y METADATA
+#   NORDER_X S32 3
+#   NORDER_Y S32 3
+#   VAL_X00_Y00  F64 -2.860068e+01
+#   VAL_X01_Y00  F64 -8.790076e-03
+#   VAL_X02_Y00  F64  2.456534e-07
+#   VAL_X03_Y00  F64  2.947749e-11
+#   VAL_X00_Y01  F64  1.948855e-02
+#   VAL_X01_Y01  F64 -2.639927e-07
+#   VAL_X02_Y01  F64  4.951474e-11
+#   VAL_X00_Y02  F64  4.341716e-07
+#   VAL_X01_Y02  F64  1.643046e-10
+#   VAL_X00_Y03  F64 -1.737983e-12
+#   NELEMENTS  S32 10
+# END
+
+# Switched order
 GHOST.CENTER.X METADATA
   NORDER_X S32 3
   NORDER_Y S32 3
-  VAL_X00_Y00  F64 -4.421024e+01
-  VAL_X01_Y00  F64 1.216270e-02
-  VAL_X02_Y00  F64 -9.721643e-08
-  VAL_X03_Y00  F64 9.976554e-11
-  VAL_X00_Y01  F64 -1.762476e-03
-  VAL_X01_Y01  F64 1.247212e-07
-  VAL_X02_Y01  F64 3.629557e-11
-  VAL_X00_Y02  F64 -1.040174e-07
-  VAL_X01_Y02  F64 1.074674e-10
-  VAL_X00_Y03  F64 1.564112e-11
+  VAL_X00_Y00  F64 -1.215661e+02
+  VAL_X01_Y00  F64  1.321875e-02
+  VAL_X02_Y00  F64 -4.017026e-09
+  VAL_X03_Y00  F64  1.148288e-10
+  VAL_X00_Y01  F64 -1.908074e-03
+  VAL_X01_Y01  F64  8.479150e-08
+  VAL_X02_Y01  F64  1.635732e-11
+  VAL_X00_Y02  F64  2.625405e-08
+  VAL_X01_Y02  F64  1.125586e-10
+  VAL_X00_Y03  F64  2.912432e-12
   NELEMENTS  S32 10
 END
@@ -18 +86 @@
   NORDER_X S32 3
   NORDER_Y S32 3
-  VAL_X00_Y00  F64 -2.189470e+00
-  VAL_X01_Y00  F64 -4.186514e-03
-  VAL_X02_Y00  F64 1.131554e-07
-  VAL_X03_Y00  F64 1.415192e-11
-  VAL_X00_Y01  F64 1.569104e-02
-  VAL_X01_Y01  F64 -1.782801e-07
-  VAL_X02_Y01  F64 8.179602e-11
-  VAL_X00_Y02  F64 2.577055e-07
-  VAL_X01_Y02  F64 8.879423e-11
-  VAL_X00_Y03  F64 5.767429e-11
+  VAL_X00_Y00  F64  2.422174e+01
+  VAL_X01_Y00  F64  4.170486e-04
+  VAL_X02_Y00  F64 -1.934260e-08
+  VAL_X03_Y00  F64 -1.173657e-12
+  VAL_X00_Y01  F64  1.189352e-02
+  VAL_X01_Y01  F64 -9.256748e-08
+  VAL_X02_Y01  F64  1.140772e-10
+  VAL_X00_Y02  F64  8.123932e-08
+  VAL_X01_Y02  F64  1.328378e-11
+  VAL_X00_Y03  F64  1.170865e-10
   NELEMENTS  S32 10
 END
 
+
+
+# These are semi-major/minor axes
+# These are my (CZW) quadratic solutions
+# GHOST.INNER.MAJOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 2.2622e+01
+#   VAL_X01  F64 1.3822e-02
+#   VAL_X02  F64 -3.7005e-07
+#   NELEMENTS  S32 3
+# END
+
+# GHOST.INNER.MINOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 4.9626e+01
+#   VAL_X01  F64 -2.4257e-04
+#   VAL_X02  F64 -1.2007e-07
+#   NELEMENTS  S32 3
+# END
+
+# GHOST.OUTER.MAJOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 9.6490e+01
+#   VAL_X01  F64 9.4250e-03
+#   VAL_X02  F64 6.5680e-07
+#   NELEMENTS  S32 3
+# END
+
+# GHOST.OUTER.MINOR METADATA
+#   NORDER_X S32 2
+#   VAL_X00  F64 9.5450e+01
+#   VAL_X01  F64 2.8775e-03
+#   VAL_X02  F64 -3.1409e-07
+#   NELEMENTS  S32 3
+# END
+
+# These are the original linear solutions
 GHOST.INNER.MAJOR METADATA
   NORDER_X S32 1

branches/eam_branches/ipp-20120405/ippconfig/gpc1/ppImage.config

@@ -25 +25 @@
 NOISEMAP                BOOL    FALSE          # Apply read noise map
 
-
+# Final detrending options 
+HAS.VIDEO       BOOL    FALSE           # Treat this OTA as if it has video data
+USE.VIDEO.DARK  BOOL    FALSE           # Use a video dark if we have video data?
+USE.VIDEO.MASK  BOOL    TRUE            # Use a video mask if we have video data?
 
 

branches/eam_branches/ipp-20120405/ippconfig/gpc1/psastro.config

@@ -113 +113 @@
 
 # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below
-PSASTRO.CATDIR              STR      SYNTH.GRIZY 
+# PSASTRO.CATDIR              STR      SYNTH.GRIZY 
+PSASTRO.CATDIR          STR     PS1.REF.20120503
+
 DVO.GETSTAR.PHOTCODE        STR      i
 DVO.GETSTAR.MAX.RHO         F32      3000.0
@@ -130 +132 @@
   ZEROPT   F32 24.563
   PHOTCODE STR g
-  GHOST_MAX_MAG                   F32 -20.0
+  GHOST_MAX_MAG                   F32 -16.5
 END
 PHOTCODE.DATA METADATA
@@ -346 +348 @@
   PSASTRO.MATCH.FIT.NITER S32    5
 
-  PSASTRO.CATDIR        STR     STS.PP5.REFCAT
+  # CATDIR with PS1 astrometry from PP5 pointing. Only works for that field
+  # PSASTRO.CATDIR      STR     STS.PP5.REFCAT
 END
 
 DEFAULT_RECIPE METADATA
-   PSASTRO.CATDIR               STR     PS1.REF.20120325
+   PSASTRO.CATDIR               STR     PS1.REF.20120503
    ZERO.POINT.USE.MEAN          BOOL    TRUE  
 END
@@ -356 +359 @@
 LAP_ASTRO METADATA
 #  PSASTRO.CATDIR                STR      3PI.20110505.REFCAT
-   PSASTRO.CATDIR                STR      SYNTH.GRIZY
-END
+#   PSASTRO.CATDIR               STR      SYNTH.GRIZY
+    PSASTRO.CATDIR               STR     PS1.REF.20120503
+   ZERO.POINT.USE.MEAN          BOOL    TRUE  
+END
+
+SYNTH_CAT METADATA
+   PSASTRO.CATDIR               STR SYNTH.GRIZY
+END
+
+TEST_REFCAT METADATA
+   PSASTRO.CATDIR               STR /data/ipp064.0/ipp/ippRefs/catdir.refcat.20120524.v0
+END

branches/eam_branches/ipp-20120405/ippconfig/isp/camera.config

@@ -62 +62 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/lulin/camera.config

@@ -63 +63 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/megacam/camera.config

@@ -137 +137 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/mosaic2/camera.config

@@ -90 +90 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-mef.mdc

@@ -59 +59 @@
 PPIMAGE.INPUT.SRC       INPUT    @FILES        CHIP       CMF
 PPIMAGE.MASK            INPUT    @DETDB        CHIP       MASK
+PPIMAGE.VIDEOMASK       INPUT    @DETDB        CHIP       MASK
 PPIMAGE.BIAS            INPUT    @DETDB        CHIP       IMAGE
 PPIMAGE.DARK            INPUT    @DETDB        CHIP       DARK
+PPIMAGE.VIDEODARK       INPUT    @DETDB        CHIP       DARK
 PPIMAGE.FLAT            INPUT    @DETDB        CHIP       IMAGE
 PPIMAGE.FRINGE          INPUT    @DETDB        CHIP       FRINGE

branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-simple.mdc

@@ -23 +23 @@
 PPIMAGE.INPUT.SRC         INPUT    @FILES        READOUT    CMF       
 PPIMAGE.MASK              INPUT    @DETDB        CHIP       MASK
+PPIMAGE.VIDEOMASK         INPUT    @DETDB        CHIP       MASK
 PPIMAGE.BIAS              INPUT    @DETDB        CHIP       IMAGE     
 PPIMAGE.DARK              INPUT    @DETDB        CHIP       DARK     
+PPIMAGE.VIDEODARK         INPUT    @DETDB        CHIP       DARK
 PPIMAGE.FLAT              INPUT    @DETDB        CHIP       IMAGE     
 PPIMAGE.FRINGE            INPUT    @DETDB        CHIP       FRINGE

branches/eam_branches/ipp-20120405/ippconfig/recipes/filerules-split.mdc

@@ -36 +36 @@
 PPIMAGE.INPUT             INPUT    @FILES        CHIP       IMAGE
 PPIMAGE.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PPIMAGE.VIDEOMASK         INPUT    @DETDB        CHIP       MASK
 PPIMAGE.INPUT.VARIANCE    INPUT    @FILES        CHIP       VARIANCE
 PPIMAGE.INPUT.PSF         INPUT    @FILES        CHIP       PSF
@@ -43 +44 @@
 PPIMAGE.NOISEMAP          INPUT    @DETDB        CHIP       IMAGE
 PPIMAGE.DARK              INPUT    @DETDB        CHIP       DARK
+PPIMAGE.VIDEODARK         INPUT    @DETDB        CHIP       DARK
 PPIMAGE.FLAT              INPUT    @DETDB        CHIP       IMAGE
 PPIMAGE.FRINGE            INPUT    @DETDB        CHIP       FRINGE

branches/eam_branches/ipp-20120405/ippconfig/recipes/ppImage.config

@@ -153 +153 @@
 
 GAIN.OVERRIDE   BOOL    FALSE           # Override a non-finite gain?
+
+# Final detrending options 
+HAS.VIDEO       BOOL    FALSE           # Treat this OTA as if it has video data
+USE.VIDEO.DARK  BOOL    FALSE           # Use a video dark if we have video data?
+USE.VIDEO.MASK  BOOL    FALSE           # Use a video mask if we have video data?
 
 DETREND.CONSTRAINTS  METADATA

branches/eam_branches/ipp-20120405/ippconfig/recipes/psastro.config

@@ -254 +254 @@
 END
 
-LAP_ASTRO METADATA
-  
+LAP_ASTRO METADATA 
+END
+
+SYNTH_CAT METADATA
+END
+
+TEST_REFCAT METADATA
 END
 

branches/eam_branches/ipp-20120405/ippconfig/recipes/psphot.config

@@ -38 +38 @@
 SKY_CLIP_SIGMA                      F32   2.0             # statistic used to measure background
 SKY_SIG                             F32   1.0             # optional sky error for 
+SKY_SLOPE_MIN                       F32   3.0             # exit radial profile loop when abs(slope) is less than this
 
 # allowed values for SKY_STAT: 
@@ -57 +58 @@
 PEAKS_POS2_NSIGMA_LIMIT             F32   25.0            # peak signficance threshold for POS2 sources. (ppSub)
                                                           # input pixels contribute less than this fraction of the flux
+PEAKS_NMAX_TOTAL                    S32   0               # maximum allowed number of peaks 0 == unlimited
+
 # parameters which adjust the footprint analysis
 USE_FOOTPRINTS                      BOOL  TRUE            # use new pmFootprint peak packaging
@@ -65 +68 @@
 FOOTPRINT_CULL_NSIGMA_MIN           F32   1               # Minimum height of colls in units of skyStdev
 FOOTPRINT_CULL_NSIGMA_PAD           F32   0.01            # Fractional Padding for stdev
+FOOTPRINT_USE_UNSUBTRACTED          BOOL  TRUE            # find footprints without sources subtracted
 
 # parameter for the simple deblending
@@ -186 +190 @@
 
 KRON_ITERATIONS                     S32   2
+KRON_APPLY_WEIGHT                   BOOL  FALSE
+KRON_APPLY_WINDOW                   BOOL  FALSE
+KRON_SMOOTH                         BOOL  FALSE
+KRON_SMOOTH_SIGMA                   F32   1.7
+KRON_SMOOTH_NSIGMA                  S32   2
 
 # Extended source fit parameters
@@ -368 +377 @@
   PSF_MODEL                           STR   PS_MODEL_GAUSS 
   EXT_MODEL                           STR   PS_MODEL_QGAUSS
+  PEAKS_NMAX_TOTAL                    S32   50000 # maximum allowed number of peaks - To avoid memory explosion
 END
 

branches/eam_branches/ipp-20120405/ippconfig/recipes/reductionClasses.mdc

@@ -225 +225 @@
         BACKGROUND_PSWARP       STR     BACKGROUND
 END
+
+DEFAULT_SYNTHCAT                METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        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     SYNTH_CAT
+        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
+END
+
 
 # Sweetspot reduction class
@@ -933 +958 @@
 END
 
+CNP_DATASET     METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        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     CNP_DATASET
+        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
+END
+
 # random user tests (may not be stable or consistent)
 TEST1 METADATA
@@ -952 +1001 @@
 END
     
+TEST_REFCAT             METADATA
+        CHIP_PPIMAGE      STR     CHIP
+        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     TEST_REFCAT
+        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
+END
+

branches/eam_branches/ipp-20120405/ippconfig/sdssmosaic/camera.config

@@ -93 +93 @@
   CMF.XSRC STR cmf.xsrc
   CMF.XFIT STR cmf.xfit
+  CMF.XRAD STR cmf.xrad # use .PSF and .EXT?
   CMF.DETEFF STR cmf.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/simmosaic/camera.config

@@ -72 +72 @@
         CMF.XSRC        STR     {CHIP.NAME}.xsrc # use .PSF and .EXT?
         CMF.XFIT        STR     {CHIP.NAME}.xfit # use .PSF and .EXT?
+        CMF.XRAD        STR     {CHIP.NAME}.xrad # use .PSF and .EXT?
         CMF.DETEFF      STR     {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/simple/camera.config

@@ -58 +58 @@
   CMF.DATA STR psf
   CMF.XSRC STR xsrc
+  CMF.XRAD STR xrad
   CMF.XFIT STR xfit
   CMF.DETEFF STR deteff

branches/eam_branches/ipp-20120405/ippconfig/ssp/camera.config

@@ -59 +59 @@
   CMF.XSRC STR xsrc
   CMF.XFIT STR xfit
+  CMF.XRAD STR xrad
   CMF.DETEFF STR deteff
 

branches/eam_branches/ipp-20120405/ippconfig/ssp/format.config

@@ -5 +5 @@
         SIMPLE          BOOL    TRUE
 ###     NAXIS           S32     2
+        DETECTOR        STR     rspiusb0
 END
 

branches/eam_branches/ipp-20120405/ippconfig/system.config

@@ -10 +10 @@
         SDSS                    STR     sdss/camera.config              # Sloan Digital Sky Survey
         GPC1                    STR     gpc1/camera.config              # Pan-STARRS GPC1
+        GPC1-TDI                STR     gpc1-tdi/camera.config          # Pan-STARRS GPC1 with TDI guiding
         ESOWFI                  STR     esowfi/camera.config            # ESO Wide-Field Imager
         LBCRED                  STR     lbc_red/camera.config           # Large Binocular Camera Red

branches/eam_branches/ipp-20120405/ippconfig/tek/camera.config

@@ -60 +60 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/uh8k/camera.config

@@ -70 +70 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/vysos20/camera.config

@@ -63 +63 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 

branches/eam_branches/ipp-20120405/ippconfig/vysos5/camera.config

@@ -63 +63 @@
   CMF.XSRC STR {CHIP.NAME}.xsrc # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff