Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/Makefile.am	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/Makefile.am	(revision 37065)
@@ -20,5 +20,6 @@
 	lulin \
 	ssp \
-	uh8k
+	uh8k \
+	suprime 
 
 install_files = \
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/configure.ac
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/configure.ac	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/configure.ac	(revision 37065)
@@ -32,4 +32,5 @@
   ssp/Makefile
   uh8k/Makefile
+  suprime/Makefile
 ])
 AC_OUTPUT
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/dvo.photcodes
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/dvo.photcodes	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/dvo.photcodes	(revision 37065)
@@ -903,4 +903,10 @@
   11400 GPC1.y.SkyChip       dep  25.000  0.000 0.000     -     - 0.0000     0     5   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
   11500 GPC1.w.SkyChip       dep  25.000  0.000 0.000     -     - 0.0000     0     9   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+  12000 GPC1.g.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     1   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+  12100 GPC1.r.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     2   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+  12200 GPC1.i.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     3   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+  12300 GPC1.z.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     4   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+  12400 GPC1.y.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     5   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
+  12500 GPC1.w.ForcedWarp    dep  25.000  0.000 0.000     -     - 0.0000     0     9   0.000 0.000 0.000  0.000   0x0000 0x0000  0x0000 0x0000
   160   MOSAIC2.B.00         dep  25.107  0.000 0.000     -     - 0.0000     0     1   0.000 0.000 1.000  0.000   0x0000 0x3888  0x0000 0x0000
   161   MOSAIC2.B.01         dep  25.120  0.000 0.000     -     - 0.0000     0     1   0.000 0.000 1.000  0.000   0x0000 0x3888  0x0000 0x0000
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/camera.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/camera.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/camera.config	(revision 37065)
@@ -139,4 +139,5 @@
   CMF.XRAD STR {CHIP.NAME}.xrad # use .PSF and .EXT?
   CMF.XFIT STR {CHIP.NAME}.xfit # use .PSF and .EXT?
+  CMF.XGAL STR {CHIP.NAME}.xgal # use .PSF and .EXT?
   CMF.DETEFF STR {CHIP.NAME}.deteff
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/dvo.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/dvo.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/dvo.config	(revision 37065)
@@ -71,2 +71,3 @@
 POS_TOOFEW              1
 RELASTRO_SIGMA_LIM      0.01  # select measurements with dM < SIGMA_LIM for relphot analysis
+PAR_FACTOR_MIN          0.2
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/format_orig.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/format_orig.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/format_orig.config	(revision 37065)
@@ -8,4 +8,5 @@
         CONTROLR        STR     STARGRASP
         NAMPS           S32     64
+	MJD-OBS		F64	54734.0  # OP: <
 END
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppImage.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppImage.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppImage.config	(revision 37065)
@@ -26,4 +26,9 @@
 
 APPLY.BURNTOOL          BOOL    TRUE           # apply burntool correction in ppImage
+
+PATTERN.CELL.SUBSET METADATA		   # Menu of chips and/or cells for cell pattern correction
+# XXX TEST ONLY (I was trying to median-subtract each cell using PATTERN.CELL to generate laser flat samples)
+#   XY40 STR 0111111111111111111111111111111111111111111111111111111111111111
+END
 
 # Final detrending options 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppStack.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppStack.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppStack.config	(revision 37065)
@@ -79,4 +79,21 @@
    MATCH.REJ        F32    4.0
    SAFE		 BOOL	F
+
+END
+
+STACK_CNP  METADATA                   ## Based on STACK_THREEPI and STACK_MD_DEEP_1DG 
+    OUTPUT.NOCOMP   	    BOOL  FALSE
+    OUTPUT.LOGFLUX  	    BOOL  TRUE
+    STACK.TYPE              STR   DEEP_STACK
+    PSF.INPUT.CLIP.SIMPLE   BOOL  True
+    PSF.INPUT.MAX           F32   10.0    #  
+    PSF.INPUT.CLIP.NSIGMA   F32   100.0
+    PSF.INPUT.THRESH        F32   NAN
+    PSF.INPUT.ASYMMETRY     F32   NAN
+
+   MATCH.REJ        F32    4.0
+   SAFE		 BOOL	F
+
+    PSF.TARGET.AS.MAX.EPSILON F32 0.1
 
 END
@@ -143,5 +160,5 @@
     STACK.TYPE              STR   DEEP_STACK  ## needed?
     PSF.INPUT.CLIP.SIMPLE   BOOL  True
-    PSF.INPUT.MAX           F32   6.0   # never really want >6 pixels in refstack, even on edges 
+    PSF.INPUT.MAX           F32   7.0   # center/edge can vary 1-2 pix, prefer <6 pix but needs to be <7 pix for edges
     PSF.INPUT.CLIP.NSIGMA   F32   1.0   # sample typically on rising side of distribution (set even smaller?)
     PSF.INPUT.THRESH        F32   NAN
@@ -151,4 +168,14 @@
     PSF.TARGET.AS.MAX       BOOL  TRUE      # Set the target PSF FWHM as the maximum of accepted input FWHM values.
     PSF.TARGET.AS.MAX.EPSILON F32 0.1       # Amount to set the target PSF FWHM larger than the maximum input. Target = eps + max(input)
+    THRESHOLD.MASK  F32     0.1             # Threshold for mask deconvolution (0..1)
+    COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
+    COMBINE.REJ     F32     3.0             # Rejection threshold in combination (sigma)
+    COMBINE.SYS     F32     0.1             # Relative systematic error in combination
+    COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+    IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
+    NMINPIX         S32     4               # Minimum input per pixel
+    MASK.VAL        STR     SUSPECT,MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels
+    MASK.BLANKBORDER S32    20              # Mask blank border in final stack output
+    BSCALEOFFSET    BOOL    TRUE            # HACK for removing bscale offset from input warps because of compression (0.5*BSCALE)
 END
 
@@ -167,4 +194,14 @@
     PSF.TARGET.AS.MAX  BOOL  TRUE
     PSF.TARGET.AS.MAX.EPSILON F32 0.1
+    THRESHOLD.MASK  F32     0.1             # Threshold for mask deconvolution (0..1)
+    COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
+    COMBINE.REJ     F32     3.0             # Rejection threshold in combination (sigma)
+    COMBINE.SYS     F32     0.1             # Relative systematic error in combination
+    COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+    IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
+    NMINPIX         S32     30              # Minimum input per pixel 
+    MASK.VAL        STR     SUSPECT,MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels
+    MASK.BLANKBORDER S32    20              # Mask blank border in final stack output
+    BSCALEOFFSET    BOOL    TRUE            # HACK for removing bscale offset from input warps because of compression (0.5*BSCALE)
 END
 
@@ -183,4 +220,32 @@
     PSF.TARGET.AS.MAX  BOOL  TRUE
     PSF.TARGET.AS.MAX.EPSILON F32 0.1
+    THRESHOLD.MASK  F32     0.5             # Threshold for mask deconvolution (0..1)
+    COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
+    COMBINE.REJ     F32     3.5             # Rejection threshold in combination (sigma)
+    COMBINE.SYS     F32     0.1             # Relative systematic error in combination
+    COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+    IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
+END
+
+STACK_MDTHREEPI_DEEP_1DG     METADATA   ## revised config for MD+3PI 
+    OUTPUT.NOCOMP           BOOL  TRUE
+    OUTPUT.LOGFLUX          BOOL  FALSE
+    OUTPUT.REPLICATE        BOOL  TRUE
+    STACK.TYPE              STR   DEEP_STACK
+    PSF.INPUT.CLIP.SIMPLE   BOOL  True
+    PSF.INPUT.MAX           F32   10.0    #
+    PSF.INPUT.CLIP.NSIGMA   F32   100.0
+    PSF.INPUT.THRESH        F32   NAN
+    PSF.INPUT.ASYMMETRY     F32   NAN
+    MATCH.REJ               F32   4.0     # need ot tune?
+    SAFE                    BOOL  FALSE
+    PSF.TARGET.AS.MAX  BOOL  TRUE
+    PSF.TARGET.AS.MAX.EPSILON F32 0.1
+    THRESHOLD.MASK  F32     0.01             # Threshold for mask deconvolution (0..1)
+    COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
+    COMBINE.REJ     F32     2.5             # Rejection threshold in combination (sigma)
+    COMBINE.SYS     F32     0.1             # Relative systematic error in combination
+    COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+    IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
 END
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psastro.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psastro.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psastro.config	(revision 37065)
@@ -66,4 +66,8 @@
 PSASTRO.USE.MODEL             BOOL     TRUE
 
+# apply Koppenhoefer Correction to this camera?
+KH.CORRECT.APPLY	      BOOL     TRUE
+KH.CORRECT.ENDDATE	      STR      2011/05/11,00:00:00
+
 # PSASTRO.FIX.CHIPS             BOOL     TRUE
 PSASTRO.PIXEL.TOLERANCE       F32      3.0
@@ -83,5 +87,5 @@
 PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.00 # max allow error for valid solution (arcsec)
 PSASTRO.MOSAIC.MAX.ERROR.N4 F32    0.00 # max allow error for valid solution (arcsec)
-PSASTRO.MOSAIC.MAX.ERROR.N5 F32    5.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N5 F32    0.30 # max allow error for valid solution (arcsec)
 
 # mosaic radius match in pixels (do these make sense?)
@@ -118,6 +122,7 @@
 # PSASTRO.CATDIR              STR      SYNTH.GRIZY 
 # PSASTRO.CATDIR		STR	PS1.REF.20120503
-PSASTRO.CATDIR               STR     PS1.REF.20120524
-
+# PSASTRO.CATDIR               STR     PS1.REF.20120524
+# PSASTRO.CATDIR               STR     PS1.REF.20140605
+PSASTRO.CATDIR               STR     PS1.REF.20140713
 
 DVO.GETSTAR.PHOTCODE        STR      i
@@ -358,6 +363,7 @@
 
 DEFAULT_RECIPE METADATA
-#   PSASTRO.CATDIR               STR     PS1.REF.20120503
-   PSASTRO.CATDIR		STR	PS1.REF.20120524
+#  PSASTRO.CATDIR               STR     PS1.REF.20120503
+#  PSASTRO.CATDIR		STR	PS1.REF.20120524
+   PSASTRO.CATDIR               STR     PS1.REF.20140605
    ZERO.POINT.USE.MEAN		BOOL	TRUE  
 END
@@ -370,7 +376,8 @@
 LAP_ASTRO METADATA
 #  PSASTRO.CATDIR                STR      3PI.20110505.REFCAT
-#   PSASTRO.CATDIR		 STR	  SYNTH.GRIZY
-#   PSASTRO.CATDIR		 STR     PS1.REF.20120503
-   PSASTRO.CATDIR               STR     PS1.REF.20120524
+#  PSASTRO.CATDIR		 STR	  SYNTH.GRIZY
+#  PSASTRO.CATDIR		 STR     PS1.REF.20120503
+#  PSASTRO.CATDIR               STR     PS1.REF.20120524
+   PSASTRO.CATDIR               STR     PS1.REF.20140605
    ZERO.POINT.USE.MEAN		BOOL	TRUE  
 END
@@ -401,5 +408,6 @@
    DVO.GETSTAR.FIXED.ZEROPT    F32   25.0
 
-   PSASTRO.CATDIR               	STR     PS1.REF.20120524
+   PSASTRO.CATDIR               STR     PS1.REF.20140605
+#  PSASTRO.CATDIR               	STR     PS1.REF.20120524
    ZERO.POINT.USE.MEAN          	BOOL    TRUE
    PSASTRO.MAX.NRAW 			S32	0 
@@ -420,5 +428,6 @@
     DVO.GETSTAR.FIXED.ZEROPT    F32   25.0
     DVO.GETSTAR.MIN.MAG.INST	F32   -15.0
-    PSASTRO.CATDIR                       STR     PS1.REF.20120524
+#   PSASTRO.CATDIR                       STR     PS1.REF.20120524
+    PSASTRO.CATDIR               STR     PS1.REF.20140605
     ZERO.POINT.USE.MEAN                  BOOL    TRUE
 
@@ -439,5 +448,6 @@
 # - similar to DEEPCAL except for MIN.NSTAR 5 to attemp more edge skycells if poorer
 STATICSKY_NIGHTCAL   METADATA
-   PSASTRO.CATDIR                  STR   PS1.REF.20120524  # reset here to ensure same catalog is used when reprocessing set uniformly
+#   PSASTRO.CATDIR                  STR   PS1.REF.20120524  # reset here to ensure same catalog is used when reprocessing set uniformly
+   PSASTRO.CATDIR               STR     PS1.REF.20140605
    REFSTAR_MASK                    BOOL  FALSE
    PSASTRO.SAVE.REFMATCH           BOOL  FALSE
@@ -475,5 +485,6 @@
 # revised setup for DEEP/MDS stacks with range of inputs, should work for N~2(edges)--500 inputs with large MIN/MAX.INST.MAG.RAW
 STATICSKY_DEEPCAL   METADATA
-   PSASTRO.CATDIR                  STR   PS1.REF.20120524  # reset here to ensure same catalog is used when reprocessing set uniformly
+   #PSASTRO.CATDIR                  STR   PS1.REF.20120524  # reset here to ensure same catalog is used when reprocessing set uniformly
+   PSASTRO.CATDIR                  STR   PS1.REF.20140605  # ensure same catalog is used when reprocessing MD set uniformly
    REFSTAR_MASK                    BOOL  FALSE
    PSASTRO.SAVE.REFMATCH           BOOL  FALSE
@@ -483,6 +494,6 @@
    ZERO.POINT.USE.MEAN             BOOL  TRUE
    PSASTRO.FIELD.PADDING           F32   0.01   # skycells are well defined, don't need large padding. 1% of 6400 is 64 pixels
-   PSASTRO.MAX.NRAW                S32   1000   # include more than MAX.NREF to account for extras like false-positives
-   PSASTRO.MAX.NREF            	   S32    500   # if edge skycell ~10% then try ~50 to match 
+   PSASTRO.MAX.NRAW                S32   1500   # include more than MAX.NREF to account for extras like false-positives
+   PSASTRO.MAX.NREF            	   S32   1000   # if edge skycell ~10% then try ~50 to match. increase to help odd bulk offsets
    PSASTRO.MIN.INST.MAG.RAW        F32   -25.0  # 
    PSASTRO.MAX.INST.MAG.RAW        F32   -5.0
@@ -494,6 +505,6 @@
    DVO.GETSTAR.MAX.RHO		   F32	 6000.0  # N/sqdeg, slightly larger than MAX.NREF 
    DVO.GETSTAR.MIN.MAG.INST        F32   -25.0   # set absurd range to cover large range of exptime, then clamp...
-   DVO.GETSTAR.MIN.MAG		   F32	 15.0    # only used if keyword problem so also using CLAMP_MAG_MIN
-   REFSTAR_CLAMP_MAG_MIN 	   F32	 15.0    # saturation in MD ~14 even in y-band, so toss out brighter in the list
+   DVO.GETSTAR.MIN.MAG		   F32	 16.5    # only used if keyword problem so also using CLAMP_MAG_MIN
+   REFSTAR_CLAMP_MAG_MIN 	   F32	 16.5    # saturation in MD ~14 even in y-band, so toss out brighter in the list. seeing offset in brighter stars
    DVO.GETSTAR.FIXED.ZEROPT        F32   0.0     # not really needed, exptime overly dominates
   
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psphot.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psphot.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psphot.config	(revision 37065)
@@ -28,11 +28,13 @@
 PSPHOT.CR.AUTOSCALE                 BOOL  FALSE
 
-PSF.TREND.NX                        S32   3
-PSF.TREND.NY                        S32   3
+PSF.TREND.NX                        S32   6
+PSF.TREND.NY                        S32   6
+
+PSF_MAX_NSTARS                      S32   2000          # limit number of stars used for PSF model
 
 # rename NONLINEAR_FIT_SN_LIM?
 FULL_FIT_SN_LIM      		    F32   25.0
 
-APTREND.ORDER.MAX    		    S32   3
+APTREND.ORDER.MAX    		    S32   6
 
 PSPHOT.CRMASK.APPLY		    BOOL  TRUE		  # TEST THIS before enabling.
@@ -53,4 +55,14 @@
   PSPHOT.EXT.DIFF.ALTERNATE	    BOOL TRUE
   PSPHOT.EXT.DIFF.ALTERNATE.THRESH  F32	 1.25
+
+  # XXX enable these when MOPS is ready
+  # LMM_FIT_CHISQ_CONVERGENCE         BOOL FALSE
+  # LMM_FIT_GAIN_FACTOR_MODE          S32  2
+  # PSF_FIT_MIN_TOL                   F32  0.2
+  # EXT_FIT_MIN_TOL                   F32  0.2 
+  # PSF_FIT_ITER                      S32  20
+  # EXT_FIT_ITER                      S32  20
+  # FOOTPRINT_CULL_NSIGMA_DELTA       F32  10
+  # FOOTPRINT_CULL_NSIGMA_MIN         F32   2  
 
   PSPHOT.EXT.FIT.ALL.SOURCES	    BOOL TRUE
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-mef.mdc
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-mef.mdc	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-mef.mdc	(revision 37065)
@@ -86,4 +86,5 @@
 PSPHOT.PSF.LOAD         INPUT    @FILES        CHIP       PSF       
 PSPHOT.INPUT.CMF        INPUT    @FILES        CHIP       CMF       
+PSPHOT.INPUT.CFF        INPUT    @FILES        CHIP       CFF
 PSPHOT.INPUT.TEXT       INPUT    @FILES        CHIP       SRCTEXT       
 PSPHOT.EXPNUM           INPUT    @FILES        CHIP       MASK       
@@ -110,4 +111,5 @@
 PSASTRO.WCS             INPUT    @FILES        CHIP       CMF
 PSASTRO.MODEL           INPUT    @DETDB        FPA        ASTROM
+PSASTRO.KH.CORRECT      INPUT    @DETDB        FPA        KH.CORRECT
 
 PSASTRO.EXTRACT.ASTROM  INPUT    @FILES        CHIP       CMF
@@ -181,4 +183,5 @@
 PPBACKGROUND.PATTERN	  INPUT    @FILES        CHIP       PATTERN
 PPBACKGROUND.BACKGROUND	  INPUT    @FILES        CHIP       IMAGE
+PPBACKGROUND.STACK        INPUT    @FILES        FPA        IMAGE
 
 ### output file definitions
@@ -247,4 +250,5 @@
 PSPHOT.OUT.CMF.SPL      OUTPUT {OUTPUT}.{CHIP.NAME}.cmf          CMF       NONE       CHIP       TRUE      SPLIT
 PSPHOT.OUT.CMF.MEF      OUTPUT {OUTPUT}.cmf                      CMF       NONE       CHIP       TRUE      MEF
+PSPHOT.OUTPUT.CFF       OUTPUT {OUTPUT}.cff                      CFF       NONE       CHIP       TRUE      MEF
 PSPHOT.PSF.RAW.SAVE     OUTPUT {OUTPUT}.psf                      PSF       NONE       CHIP       TRUE      MEF
 PSPHOT.PSF.SKY.SAVE     OUTPUT {OUTPUT}.psf                      PSF       NONE       CHIP       TRUE      MEF
@@ -390,4 +394,7 @@
 TRACE.EXP.UPDATE        OUTPUT {OUTPUT}.trace.update             TEXT      NONE       FPA        TRUE      NONE
 
+DBINFO.IMFILE                OUTPUT {OUTPUT}.{CHIP.NAME}.dbinfo       TEXT            NONE       CHIP       TRUE      NONE
+DBINFO.EXP                   OUTPUT {OUTPUT}.dbinfo                   TEXT            NONE       CHIP       TRUE      NONE
+
 PPNOISEMAP.OUTPUT       OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
 
@@ -409,2 +416,6 @@
 PPBACKGROUND.CONFIG          OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT        NONE       CHIP       TRUE      NONE
 PPBACKGROUND.STATS           OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE
+
+PPBACKGROUND.STACK.OUTPUT    OUTPUT {OUTPUT}.bkgrest.fits        IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPBACKGROUND.STACK.MODEL     OUTPUT {OUTPUT}.bkgmdl.fits        IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPBACKGROUND.OTA.SOLUTION    OUTPUT {OUTPUT}.{CHIP.NAME}.OTAS.fits IMAGE  COMP_IMG   CHIP       TRUE      NONE
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-simple.mdc
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-simple.mdc	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-simple.mdc	(revision 37065)
@@ -57,4 +57,5 @@
 PSPHOT.PSF.LOAD           INPUT    @FILES        CHIP       PSF       
 PSPHOT.INPUT.CMF          INPUT    @FILES        CHIP       CMF       
+PSPHOT.INPUT.CFF          INPUT    @FILES        CHIP       CFF
 PSPHOT.INPUT.TEXT         INPUT    @FILES        CHIP       SRCTEXT       
 PSPHOT.EXPNUM             INPUT    @FILES        CHIP       MASK
@@ -80,4 +81,5 @@
 PSASTRO.WCS               INPUT    @FILES        CHIP       CMF
 PSASTRO.MODEL             INPUT    @DETDB        FPA        ASTROM
+PSASTRO.KH.CORRECT        INPUT    @DETDB        FPA        KH.CORRECT
 
 PSASTRO.EXTRACT.ASTROM    INPUT    @FILES        CHIP       CMF
@@ -153,4 +155,5 @@
 PPBACKGROUND.PATTERN	  INPUT    @FILES        CHIP       PATTERN
 PPBACKGROUND.BACKGROUND	  INPUT    @FILES        CHIP       IMAGE
+PPBACKGROUND.STACK        INPUT    @FILES        FPA        IMAGE
 
 ### output file definitions
@@ -209,4 +212,5 @@
 PSPHOT.OUTPUT.CMF            OUTPUT {OUTPUT}.cmf                  CMF             NONE       CHIP       TRUE      NONE
 PSPHOT.OUT.CMF.MEF           OUTPUT {OUTPUT}.cmf                  CMF             NONE       CHIP       TRUE      NONE
+PSPHOT.OUTPUT.CFF            OUTPUT {OUTPUT}.cff                  CFF             NONE       CHIP       TRUE      NONE
 PSPHOT.PSF.RAW.SAVE          OUTPUT {OUTPUT}.psf                  PSF             NONE       FPA        TRUE      NONE
 PSPHOT.PSF.SKY.SAVE          OUTPUT {OUTPUT}.psf                  PSF             NONE       FPA        TRUE      NONE
@@ -347,4 +351,7 @@
 TRACE.EXP.UPDATE             OUTPUT {OUTPUT}.exp.trace.update     TEXT            NONE       FPA        TRUE      NONE
 
+DBINFO.IMFILE                OUTPUT {OUTPUT}.{CHIP.NAME}.dbinfo       TEXT            NONE       CHIP       TRUE      NONE
+DBINFO.EXP                   OUTPUT {OUTPUT}.dbinfo                   TEXT            NONE       CHIP       TRUE      NONE
+
 PPNOISEMAP.OUTPUT            OUTPUT {OUTPUT}.{CHIP.NAME}.fits     IMAGE           NONE       CHIP       TRUE      NONE
 
@@ -366,2 +373,6 @@
 PPBACKGROUND.CONFIG          OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT        NONE       CHIP       TRUE      NONE
 PPBACKGROUND.STATS           OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE
+
+PPBACKGROUND.STACK.OUTPUT    OUTPUT {OUTPUT}.bkgrest.fits        IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPBACKGROUND.STACK.MODEL     OUTPUT {OUTPUT}.bkgmdl.fits        IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPBACKGROUND.OTA.SOLUTION    OUTPUT {OUTPUT}.{CHIP.NAME}.OTAS.fits IMAGE  COMP_IMG   CHIP       TRUE      NONE
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-split.mdc
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-split.mdc	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-split.mdc	(revision 37065)
@@ -101,4 +101,5 @@
 PSASTRO.WCS               INPUT    @FILES        CHIP       WCS
 PSASTRO.MODEL             INPUT    @DETDB        FPA        ASTROM
+PSASTRO.KH.CORRECT        INPUT    @DETDB        FPA        KH.CORRECT
                           
 PSASTRO.EXTRACT.ASTROM    INPUT    @FILES        CHIP       CMF
@@ -177,4 +178,5 @@
 PPBACKGROUND.PATTERN	  INPUT    @FILES        CHIP       PATTERN
 PPBACKGROUND.BACKGROUND	  INPUT    @FILES        CHIP       IMAGE
+PPBACKGROUND.STACK        INPUT    @FILES        FPA        IMAGE
 
 ### output file definitions
@@ -399,4 +401,7 @@
 TRACE.EXP.UPDATE             OUTPUT {OUTPUT}.trace.update             TEXT            NONE       FPA        TRUE      NONE
 
+DBINFO.IMFILE                OUTPUT {OUTPUT}.{CHIP.NAME}.dbinfo       TEXT            NONE       CHIP       TRUE      NONE
+DBINFO.EXP                   OUTPUT {OUTPUT}.dbinfo                   TEXT            NONE       CHIP       TRUE      NONE
+
 PPNOISEMAP.OUTPUT            OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
 
@@ -430,4 +435,8 @@
 PPBACKGROUND.CONFIG          OUTPUT {OUTPUT}.{CHIP.NAME}.ppBackground.mdc TEXT        NONE       CHIP       TRUE      NONE
 PPBACKGROUND.STATS           OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE
+
+PPBACKGROUND.STACK.OUTPUT    OUTPUT {OUTPUT}.bkgrest.fits        IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPBACKGROUND.STACK.MODEL     OUTPUT {OUTPUT}.bkgmdl.fits        IMAGE     COMP_IMG   FPA        TRUE      NONE
+PPBACKGROUND.OTA.SOLUTION    OUTPUT {OUTPUT}.{CHIP.NAME}.OTAS.fits IMAGE  COMP_IMG   CHIP       TRUE      NONE
 
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppSim.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppSim.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppSim.config	(revision 37065)
@@ -61,4 +61,5 @@
 PSF.THETA	F32	0.0
 PSF.CONVOLVE    BOOL    FALSE		# generate fake stars with PSF (F), or smooth with PSF (T)?
+CONVOLVE.NSIGMA F32     5.0		# smooth image out to NSIGMA * sigma
 
 STARS.GRID      BOOL    FALSE		# Add grid of fake stars with constant flux
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStack.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStack.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStack.config	(revision 37065)
@@ -13,4 +13,5 @@
 MASK.BAD	STR	BLANK		# Mask value to give bad pixels
 MASK.POOR	STR	CONV.POOR	# Mask value to give poor pixels
+MASK.BLANKBORDER S32    0               # Mask blank border in final stack output (may want to set KERNEL.SIZE)
 
 # we are in some danger of inconsistency in the definition of a 'bad' vs a 'suspect' pixel
@@ -32,4 +33,6 @@
 TARGET.FRAC	F32	0.1		# Minimum flux fraction for target PSF
 TARGET.MINMAG	F32	3.0		# Minimum magnitude difference to tolerate in stamp
+NMINPIX		S32	1 		# Minimum input per pixel 
+BSCALEOFFSET    BOOL    FALSE           # HACK for removing offset from input warps because of compression (0.5*BSCALE)
 
 BACKGROUND.MODEL    BOOL   FALSE        # Construct a stacked version of the warp stage background
@@ -166,4 +169,6 @@
 STACK_THREEPI_ALT  METADATA
 END
+STACK_CNP  METADATA
+END
 
 STACK_MD_REF    METADATA
@@ -187,4 +192,7 @@
 STACK_NIGHTLY_1DG  METADATA
     STACK.TYPE      STR     NIGHTLY_STACK
+END
+
+STACK_MDTHREEPI_DEEP_1DG   METADATA
 END
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStats.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStats.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStats.config	(revision 37065)
@@ -116,4 +116,5 @@
   HEADER        STR     DT_ASTR  # elapsed time in astrometry processing
   HEADER        STR     NASTRO
+  HEADER        STR     ASTROM_CHIPS
 
   HEADER        STR     ZPT_OBS
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStatsFromMetadata.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStatsFromMetadata.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStatsFromMetadata.config	(revision 37065)
@@ -274,4 +274,5 @@
   ENTRY  VAL  DT_ASTR             F32  SUM              -dtime_astrom      
   ENTRY  VAL  NASTRO              S32  SUM              -n_astrom          
+  ENTRY  VAL  ASTROM_CHIPS        U64  BITWISEOR        -astrom_chips
 
   ENTRY  VAL  ZPT_OBS             F32  SAMPLE_MEAN      -zpt_obs
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psastro.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psastro.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psastro.config	(revision 37065)
@@ -3,4 +3,5 @@
 PSASTRO.ONLY.REFSTARS      BOOL FALSE  # skip all but refstar matches
 PSASTRO.SAVE.REFMATCH      BOOL FALSE  # save refstar matches as table in output smf file
+PSASTRO.SAVE.CFF           BOOL FALSE  # save a cff file (input for psphotFullForce)
 
 # select which WCS style to use on output images.
@@ -229,4 +230,8 @@
 PSASTRO.USE.MODEL             BOOL     FALSE
 
+# apply Koppenhoefer Correction to this camera?
+KH.CORRECT.APPLY	      BOOL     FALSE
+KH.CORRECT.ENDDATE	      STR      NONE
+
 PSASTRO.PIXEL.TOLERANCE       F32      3.0
 PSASTRO.ANGLE.TOLERANCE       F32      1.0
@@ -279,4 +284,5 @@
 
 STATICSKY_CAL   METADATA
+    PSASTRO.SAVE.CFF           BOOL TRUE  # save a cff file (input for psphotFullForce)
 END
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psphot.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psphot.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psphot.config	(revision 37065)
@@ -1,3 +1,2 @@
-
 # these options turn on different inputs and/or outputs
 SAVE.OUTPUT                         BOOL  TRUE
@@ -16,5 +15,5 @@
 
 # format for output CMF files
-OUTPUT.FORMAT                       STR   PS1_V3
+OUTPUT.FORMAT                       STR   PS1_V5
 
 # the zero point is used to set a basic scale for DVO
@@ -41,5 +40,5 @@
 
 # allowed values for SKY_STAT: 
-# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN
+# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEDIAN, ROBUST_QUARTILE, FITTED_MEAN
 
 # masking parameters (XXX EAM : rework this to use psRegion like ANALYSIS_REGION)
@@ -181,4 +180,5 @@
 EXT_FIT_MIN_TOL                     F32   0.01            # Fit tolerance for EXT
 EXT_FIT_MAX_TOL                     F32   2.00            # Fit tolerance for EXT
+EXT_FIT_NSIGMA_CONV                 F32   9.00            # Number of sigma for PSF convolved fits
 
 # the following is used to require a minimum quality of fit before
@@ -189,12 +189,39 @@
 
 # extended source aperture-like measurements
-EXTENDED_SOURCE_ANALYSIS            BOOL  FALSE  # perform any of the aperture-like measurements?
+EXTENDED_SOURCE_PETROSIAN           BOOL  FALSE
+EXTENDED_SOURCE_ANNULI              BOOL  FALSE
+EXTENDED_SOURCE_RAW_RADIUS          BOOL  FALSE  # use circular (T) or elliptical (F) contours for petrosians?
 EXTENDED_SOURCE_SN_LIM              F32   20.0
-EXTENDED_SOURCE_RAW_RADIUS          BOOL  FALSE
-EXTENDED_SOURCE_PETROSIAN           BOOL  FALSE
-EXTENDED_SOURCE_ISOPHOTAL           BOOL  FALSE
-EXTENDED_SOURCE_ANNULI              BOOL  FALSE
-EXTENDED_SOURCE_KRON                BOOL  FALSE
-PETROSIAN_FOR_STARS                 BOOL  FALSE
+
+EXT.NSIGMA.LIMIT.USE                BOOL  TRUE
+
+# Extended Model to use for forced photometry in full force
+# In addtion to PS_MODEL_SERSIC, PS_MODEL_DEV, and PS_MODEL_EXP  the values BEST and ALL may be selected
+# This specifies what gets saved in cff file output by psastro
+EXT_MODEL_TYPE_FOR_CFF              STR   ALL
+# this model is forced
+EXT_MODEL_TYPE_FORCE                STR   PS_MODEL_SERSIC
+
+# if the sersic model is selected, the dev model will also be forced for sources with sersic index above this limit
+# (Note: this is not used if BEST was selected)
+EXT_MODEL_FORCE_DEV_SERSIC_MIN      F32   3.0
+
+# to avoid forcing extended models for likely stars
+# only force sources with kron mag - psf mag less than this value ...
+EXT_MODEL_FORCE_MAGDIFF_MAX         F32   0.0
+# ... unless SN is less than this value
+EXT_MODEL_FORCE_CUT_SN_MIN          F32   10.0
+
+# Limits on extended source fits by galactic coordinates 
+EXT.FIT.MIN.GAL.LIMIT.USE           BOOL  FALSE # if true apply the galactic latitude cut
+# objects are skipped for extended source fits if they have a abs(galactic latitude) larger than
+# a limit value which is a function of galactic longitude.
+#     The galactic latitude limit is the sum of the following constant value ...
+EXT.FIT.MIN.GAL.LIMIT               F32   20.0
+# ... and a gaussian function of galactic longitude centered at b = 0 with this magnitude
+EXT.FIT.MIN.GAL.LIMIT.BULGE         F32   15.0  
+# ... and this sigma
+EXT.FIT.MIN.GAL.LIMIT.BULGE.SIGMA   F32   50.0  # with this sigma value
+
 
 KRON_ITERATIONS                     S32   2
@@ -207,6 +234,10 @@
 # these models are used for high-quality shape analysis after all sources have been removed
 EXTENDED_SOURCE_FITS                BOOL  FALSE  # perform the detailed extended sourc fits?
+EXTENDED_SOURCE_FITS_INTERACTIVE    BOOL  FALSE  # perform the detailed extended sourc fits?
+EXTENDED_SOURCE_FITS_POISSON        BOOL  FALSE   # use poisson errors for extended source models
 
 EXTENDED_SOURCE_MODELS_SELECTION    STR   ALL
+
+LENSING_PARAMETERS                  BOOL  FALSE
 
 # extended source models applied to sources
@@ -221,7 +252,7 @@
  #QGAUSS_PSF  EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS   20.0    TRUE
  # TRAIL_RAW EXTENDED_SOURCE_MODEL  PS_MODEL_TRAIL    10.0   FALSE
- EXP_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP      10.0    TRUE
- DEV_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV      10.0    TRUE
- SER_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   10.0    TRUE
+ EXP_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP      0.0    TRUE
+ DEV_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV      0.0    TRUE
+ SER_PCM  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC   0.0    TRUE
 END
 
@@ -257,10 +288,6 @@
 # Extended source fit parameters
 EXTENDED_TEST                       METADATA
-  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ISOPHOTAL           BOOL  TRUE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
-  EXTENDED_SOURCE_KRON                BOOL  FALSE
 END
 
@@ -292,5 +319,5 @@
 INTERPOLATE_AP                      BOOL  TRUE
 
-POISSON.ERRORS.PHOT.LMM             BOOL  TRUE   
+POISSON.ERRORS.PHOT.LMM             BOOL  TRUE
 POISSON.ERRORS.PHOT.LIN             BOOL  FALSE
 POISSON.ERRORS.PARAMS               BOOL  TRUE
@@ -407,4 +434,15 @@
 END
 
+EXT.ANALYSIS.MAG.LIMITS METADATA
+    TYPE  DATA FILTER.ID MAG.LIMIT.PETRO    MAG.LIMIT.EXTFIT
+    gband DATA g         25                 21.5
+    rband DATA r         25       	    21.5 
+    iband DATA i         25		    21.5
+    zband DATA z         25		    20.5
+    yband DATA y         25		    19.5
+    wband DATA w         25		    21.5
+    other DATA any       25		    21.5
+END
+
 # if true keep all matched sources, even if we get a non-finite aperture flux measurement
 PSPHOT.STACK.KEEP.BAD.MATCHES  BOOL     F
@@ -413,11 +451,38 @@
 RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
 
+# zero point and exposure time to which fullForceSummary scales fluxes to
+PSPHOT.FULLFORCE.EXPTIME            F32   1.00 
+PSPHOT.FULLFORCE.ZERO_PT            F32   25.00
+
+
+GALAXY_SHAPES                       BOOL  F
+GALAXY_SHAPES_STYLE                 STR   R_MAJ_R_MIN
+
+# new recipe values which set paramter spacing based on signal to noise
+# DELTA = Q / SN
+# F_MIN = 1 - NSIGMA * DELTA
+# F_MAX = 1 + NSIGMA * DELTA
+GALAXY_SHAPES_Q                     F32   1.5       # these values result in
+GALAXY_SHAPES_NSIGMA                F32   2.0       # a 5 x 5 grid
+GALAXY_SHAPES_CLAMP_SN              F32   50.       # with minimum delta .03 pixels
+
+# These recipe values are no longer used
+GALAXY_SHAPES_FR_MAJOR_MIN          F32   0.8
+GALAXY_SHAPES_FR_MAJOR_MAX          F32   1.60
+GALAXY_SHAPES_FR_MAJOR_DEL          F32   0.2
+GALAXY_SHAPES_FR_MINOR_MIN          F32   0.8
+GALAXY_SHAPES_FR_MINOR_MAX          F32   1.60
+GALAXY_SHAPES_FR_MINOR_DEL          F32   0.2
+
+
 # Extended source fit parameters
 STACKPHOT                             METADATA
   EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  TRUE  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   10.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
   EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+  EXT.NSIGMA.LIMIT.USE                BOOL  FALSE
+  EXT.FIT.MIN.GAL.LIMIT.USE           BOOL  TRUE  # limit extended source fits by galactic coordinates
+
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
@@ -429,6 +494,5 @@
   RADIAL_APERTURES                    BOOL  T    # calculate flux in circular radial apertures?
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
-  OUTPUT.FORMAT                       STR   PS1_SV1
-  PETROSIAN_FOR_STARS                 BOOL  FALSE
+  OUTPUT.FORMAT                       STR   PS1_SV3
 
   # subtract radial profiles for extremely bright stars?
@@ -438,8 +502,14 @@
   POISSON.ERRORS.PHOT.LMM             BOOL  TRUE
 
+  LMM_FIT_CHISQ_CONVERGENCE           BOOL  FALSE           # use the (old) chisq convergence or the new parameter one 
+  LMM_FIT_GAIN_FACTOR_MODE            S32   2               # there are 3 options to determine the gain factor (0,1,2)
+  EXT_FIT_MIN_TOL                     F32   0.1             # Fit tolerance for EXT
+
   EXT_FIT_MAX_RADIUS                  F32   50.0
   PSF_MODEL                           STR   PS_MODEL_PS1_V1 
   EXT_MODEL                           STR   PS_MODEL_QGAUSS
   PEAKS_NMAX_TOTAL                    S32   0 # set this to limit the allowed number of peaks - Yields fault instead of avoid memory explosion
+
+  SAVE.RESID                          BOOL  FALSE
 END
 
@@ -447,8 +517,7 @@
 STACKPHOT_TEST                        METADATA
   EXTENDED_SOURCE_FITS                BOOL  F  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  F  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   10.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  F
-  EXTENDED_SOURCE_ANNULI              BOOL  F
+
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
@@ -457,5 +526,5 @@
   RADIAL_APERTURES                    BOOL  F    # calculate flux in circular radial apertures?
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
-  OUTPUT.FORMAT                       STR   PS1_SV1
+  OUTPUT.FORMAT                       STR   PS1_SV3
 
   EXT_FIT_MAX_RADIUS                  F32   50.0
@@ -467,8 +536,7 @@
 STACKPHOT_TEST_V1                     METADATA
   EXTENDED_SOURCE_FITS                BOOL  F  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  F  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
@@ -492,8 +560,7 @@
 SINGLE_TEST_V1                     METADATA
   EXTENDED_SOURCE_FITS                BOOL  F  # perform any of the aperture-like measurements?
-  EXTENDED_SOURCE_ANALYSIS            BOOL  F  # perform any of the aperture-like measurements?
   EXTENDED_SOURCE_SN_LIM              F32   20.0
   EXTENDED_SOURCE_PETROSIAN           BOOL  TRUE
-  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+
   PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
   PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  F    # automatically determine target PSF size?
@@ -502,9 +569,6 @@
   RADIAL_APERTURES                    BOOL  F    # calculate flux in circular radial apertures?
   RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
-#  OUTPUT.FORMAT                       STR   PS1_SV1
   OUTPUT.FORMAT                       STR   PS1_V3
 
-  # CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  TRUE
-  # POISSON.ERRORS.PHOT.LMM             BOOL  FALSE
   CONSTANT_PHOTOMETRIC_WEIGHTS        BOOL  FALSE
   POISSON.ERRORS.PHOT.LMM             BOOL  TRUE
@@ -621,6 +685,18 @@
   # Extended source fit parameters
   # these models are used for high-quality shape analysis after all sources have been removed
+  SAVE.RESID BOOL T
+
   EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform the detailed extended sourc fits?
-  EXT_MODEL                           STR   PS_MODEL_EXP
+  EXT_MODEL                           STR   PS_MODEL_QGAUSS
+  PSF_MODEL                           STR   PS_MODEL_PS1_V1
+
+  LMM_FIT_CHISQ_CONVERGENCE           BOOL  FALSE           # use the (old) chisq convergence or the new parameter one 
+  LMM_FIT_GAIN_FACTOR_MODE            S32   2               # there are 3 options to determine the gain factor (0,1,2)
+  EXT_FIT_MIN_TOL                     F32   0.1             # Fit tolerance for EXT
+
+  # XXX these are only needed if we want to get perfect fits of the synthetic data
+  PSF_FIT_RADIUS_SCALE         F32   3.75
+  EXT_FIT_NSIGMA_CONV          F32   11
+  PSF.RESIDUALS BOOL F
 
   # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid)
@@ -647,2 +723,15 @@
   END
 END
+
+FULLFORCE_WARP METADATA
+    GALAXY_SHAPES           BOOL    TRUE
+    RADIAL_APERTURES        BOOL    TRUE
+    EXTENDED_SOURCE_FITS    BOOL    TRUE    # this casues the xfit extension to be written out
+    EXTENDED_SOURCE_PETROSIAN BOOL  TRUE    # To measure petrosian magnitudes
+    EXTENDED_SOURCE_ANNULI  BOOL    TRUE
+    LENSING_PARAMETERS      BOOL    TRUE
+    SAVE.PSF                BOOL    FALSE
+    SAVE.BACKMDL            BOOL    FALSE
+    SAVE.RESID              BOOL    FALSE
+    OUTPUT.FORMAT           STR     PS1_V5
+END
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/reductionClasses.mdc
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/reductionClasses.mdc	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/reductionClasses.mdc	(revision 37065)
@@ -615,4 +615,10 @@
 THREEPI_STACK_1DG         METADATA
       STACK_PPSTACK   STR      STACK_THREEPI
+      STACK_PPSUB     STR      STACK_1DG
+      STACK_PSPHOT    STR      STACK
+END
+
+CNP_STACK_1DG         METADATA
+      STACK_PPSTACK   STR      STACK_CNP
       STACK_PPSUB     STR      STACK_1DG
       STACK_PSPHOT    STR      STACK
@@ -663,4 +669,15 @@
       STACKPHOT_SINGLE_PSPHOT STR     STACKPHOT_SINGLE
       STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL 
+END
+
+MDTHREEPI_DEEP_STACK_1DG            METADATA
+      STACK_PPSTACK           STR     STACK_MDTHREEPI_DEEP_1DG
+      STACK_PPSUB             STR     STACK_1DG
+      STACK_PSPHOT            STR     STACK
+      STACKPHOT_PSPHOT        STR     STACKPHOT
+      STACKPHOT_PPSUB         STR     STACKPHOT_1DG
+      STACKPHOT_PPSTACK       STR     STACKPHOT
+      STACKPHOT_SINGLE_PSPHOT STR     STACKPHOT_SINGLE
+      STATICSKY_CALIBRATION   STR     STATICSKY_DEEPCAL
 END
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/simple/camera.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/simple/camera.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/simple/camera.config	(revision 37065)
@@ -61,4 +61,5 @@
   CMF.XFIT STR xfit
   CMF.DETEFF STR deteff
+  CMF.XGAL STR xgal
 
   PSF.HEAD  STR hdr
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/simtest/format.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/simtest/format.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/simtest/format.config	(revision 37065)
@@ -60,5 +60,5 @@
         FPA.LATITUDE    F64     20.7070999146 # North Latitude in Degrees 
         FPA.ELEVATION   F32     3048.0 # altitude in meters
-	CELL.SATURATION	F32	65535
+	CELL.SATURATION	F32	1000000
 	CELL.BAD	F32	0
 	CELL.READDIR	S32	1
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/Makefile.am	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/Makefile.am	(revision 37065)
@@ -0,0 +1,26 @@
+
+installdir = $(datadir)/ippconfig/suprime
+
+install_files = \
+	dvo.config \
+	dvo.layout \
+	camera.config \
+	format_raw.config \
+	format_mef.config \
+	format_split.config \
+	ppImage.config \
+	ppMerge.config \
+	psastro.config \
+	psphot.config \
+	pswarp.config \
+	ppStack.config \
+	rejections.config
+
+install_DATA = $(install_files)
+
+install-data-hook:
+	chmod 0755 $(installdir)
+
+EXTRA_DIST = $(install_files)
+
+ACLOCAL_AMFLAGS = -I m4
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/camera.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/camera.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/camera.config	(revision 37065)
@@ -0,0 +1,133 @@
+# Camera configuration file for MegaCam: describes the camera
+
+# File formats that we know about
+FORMATS         METADATA
+	MEF	STR	suprime/format_mef.config
+        RAW     STR     suprime/format_raw.config
+        SPLIT   STR     suprime/format_split.config
+END
+
+# Description of camera --- all the chips and the cells that comprise them
+FPA     METADATA
+	XY01	 STR	Cell
+	XY11	 STR	Cell
+	XY21	 STR	Cell
+	XY00	 STR	Cell
+	XY10	 STR	Cell
+	XY20	 STR	Cell
+	XY41	 STR	Cell
+	XY31	 STR	Cell
+	XY40	 STR	Cell
+	XY30	 STR	Cell
+	XY01_raw STR	ch1 ch2 ch3 ch4
+	XY11_raw STR	ch1 ch2 ch3 ch4
+	XY21_raw STR	ch1 ch2 ch3 ch4
+	XY00_raw STR	ch1 ch2 ch3 ch4
+	XY10_raw STR	ch1 ch2 ch3 ch4
+	XY20_raw STR	ch1 ch2 ch3 ch4
+	XY41_raw STR	ch1 ch2 ch3 ch4
+	XY31_raw STR	ch1 ch2 ch3 ch4
+	XY40_raw STR	ch1 ch2 ch3 ch4
+	XY30_raw STR	ch1 ch2 ch3 ch4
+END
+
+# move this elsewhere?  we need a lookup table to go from filter ID to abstract name
+FILTER.ID       METADATA
+  Rc        STR   W-C-RC
+  Vr	    STR	  W-J-VR
+
+  B	    STR	  W-J-B
+  V	    STR	  W-J-V
+  R	    STR	  W-C-RC
+  I	    STR	  W-C-IC
+  g	    STR	  W-S-G+
+  r	    STR	  W-S-R+
+  i	    STR	  W-S-I+
+  z	    STR	  W-S-Z+
+  
+  Y	    STR	  W-J-Y
+END
+
+# Table of strings to use for the class identifier (see ippdb) according to the file level.
+CLASSID         METADATA
+        FPA     STR     fpa
+        CHIP    STR     {CHIP.NAME}
+        CELL    STR     {CHIP.NAME}:{CELL.NAME}
+        fpa     STR     fpa
+        chip    STR     {CHIP.NAME}
+        cell    STR     {CHIP.NAME}:{CELL.NAME}
+END
+
+DVO.CAMERADIR	STR	suprime		# Camera directory for DVO
+
+# convert supplied FPA.OBSTYPE values to abstract exptype names
+OBSTYPE.TABLE METADATA
+  bias     STR BIAS
+  zero     STR BIAS
+  dark     STR DARK
+  flat     STR SKYFLAT
+  skyflat  STR SKYFLAT
+  domeflat STR DOMEFLAT
+  object   STR OBJECT
+  science  STR OBJECT
+END
+
+# Recipe options
+RECIPES         METADATA
+        # Other recipes
+        PSPHOT          STR     suprime/psphot.config           # psphot details
+        PSASTRO         STR     suprime/psastro.config          # psastro details
+	PSWARP		STR	suprime/pswarp.config		# pswarp details
+        PPIMAGE         STR     suprime/ppImage.config          # ppImage recipe
+	REJECTIONS      STR     suprime/rejections.config       # rejection recipe
+	PPMERGE		STR	suprime/ppMerge.config		# ppMerge recipe
+	PPSTACK		STR	suprime/ppStack.config          # ppStack recipe
+END
+
+# reduction classes (recipes which are grouped together)
+REDUCTION	STR	recipes/reductionClasses.mdc
+
+FITSTYPES       STR     recipes/fitstypes.mdc
+
+FILERULES	STR	recipes/filerules-split.mdc		# File rules appropriate for MEF format
+
+EXTNAME.RULES METADATA
+  CMF.HEAD   STR {CHIP.NAME}.hdr
+  CMF.DATA   STR {CHIP.NAME}.psf # use .PSF and .EXT?
+  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
+
+  PSF.HEAD   STR {CHIP.NAME}.hdr
+  PSF.TABLE  STR {CHIP.NAME}.psf_model
+  PSF.RESID  STR {CHIP.NAME}.psf_resid
+
+  REF.ASTROM STR {CHIP.NAME}.ref_astrom
+END
+
+BLANK.HEADERS	METADATA
+	FPA.TIME	STR	MJD
+	FPA.EXPOSURE	STR	EXPTIME
+	FPA.AIRMASS	STR	AIRMASS
+	FPA.OBS		STR	EXP-ID
+END
+
+PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}.{CHIP.N}		# Rule for generating photcode
+
+BURNTOOL.STATE.GOOD        S16  0  # Value for burntool_state with the most recent bt version.
+BURNTOOL.STATE.GOOD.UPDATE S16  0  # for upddate processing accept earlier version
+
+FOV_REF                     F32     0   # Field of view of unvignetted region in FPA pixels.
+FOV_MAX			    F32	    0
+NPIX_REF 		    S32	    0
+NPIX_MAX		    S32	    0
+NPIX_INTERCHIP              S32     0
+
+# This sets the maximum size for the fwhm_major.  This is roughly 3", and 98.67% of all exposures in the database are less than this.
+MAX_ALLOWED_FWHM          F32         25
+
+# don't censor any masked pixels
+MASK.NO.CENSOR          U32 4294967295
+
+METADATA.COMPRESSION         STR      7f # compression mode (nM): n = 1-9, M = f (filtered), h (Huffman), R (run-length)
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/dvo.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/dvo.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/dvo.config	(revision 37065)
@@ -0,0 +1,70 @@
+
+# location of DVO database tables
+CATDIR			/data/alala.0/eugene/isp/catdir
+
+# word used to identify photcodes belonging to this camera
+MOSAICNAME		SUPRIMECAM
+
+# keywords used by DVO to interpret the headers
+
+# keyword abstractions:
+#DATE-KEYWORD		DATE-OBS
+#DATE-MODE		yyyy-mm-dd
+#UT-KEYWORD		UTC-OBS
+JD-KEYWORD		NONE
+MJD-KEYWORD		MJD
+
+# other keyword abstractions
+EXPTIME-KEYWORD		EXPTIME
+AIRMASS-KEYWORD		AIRMASS
+CCDNUM-KEYWORD		DET-ID
+ST-KEYWORD		NONE
+OBSERVATORY-LATITUDE	NONE
+OBSERVATORY-LONGITUDE	NONE
+SUBPIX_DATAFILE		NONE
+
+# instrumental magnitude range for calibration mode 
+CAL_INSTMAG_MAX		0
+CAL_INSTMAG_MIN		0
+
+# exclude overscan region from the dB image boundaries
+XOVERSCAN		0
+YOVERSCAN		0
+
+# only upload stars within region; a value of 0 means ignore the limit
+ADDSTAR_XMIN		0
+ADDSTAR_XMAX		0
+ADDSTAR_YMIN		0
+ADDSTAR_YMAX		0
+
+# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT)
+ADDSTAR_SNLIMIT		0
+
+# correlation radius (arcseconds)
+ADDSTAR_RADIUS		1.0
+
+# scaled correlation radius 
+ADDSTAR_NSIGMA		0
+
+IMAGE_SCATTER           0.075  # mark images POOR if stdev(Mcal) > IMAGE_SCATTER
+STAR_SCATTER            0.005  # mark stars POOR if stdev(Mrel) > STAR_SCATTER
+IMAGE_OFFSET            0.100  # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET
+STAR_CHISQ              10.0   # mark stars POOR if Xm > STAR_CHISQ
+STAR_TOOFEW              3     # mark star FEW if N(good) < STAR_TOOFEW
+IMAGE_TOOFEW            10     # mark image FEW if N(good) < IMAGE_TOOFEW
+IMAGE_GOOD_FRACTION     0.05   # mark image FEW if N(good) < IMAGE_GOOD_FRACTION * Nstars
+
+SCATTER_LIM             15.0
+MAG_LIM                 20.0   # select stars brighter than this for relphot analysis
+SIGMA_LIM               0.015  # select measurements with dM < SIGMA_LIM for relphot analysis
+# INST_MAG_MIN         -17     # optional constraints on magnitude ranges
+# INST_MAG_MAX         -13     # optional constraints on magnitude ranges
+
+RELPHOT_GRID_BINNING    256
+RELPHOT_GRID_X 6
+RELPHOT_GRID_Y 14
+
+PM_DT_MIN               0.25
+PM_TOOFEW               4
+POS_TOOFEW              1
+
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/dvo.layout
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/dvo.layout	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/dvo.layout	(revision 37065)
@@ -0,0 +1,27 @@
+# this file defines the layout of the mosaic imager:
+
+# NCCD 40  # this needs work: sometimes 36, sometimes 40
+NCCD 10
+NAXIS1 2048
+NAXIS2 4225
+
+MOSAIC_X 5
+MOSAIC_Y 2
+
+# lines need to contain:
+
+CHIPID_KEYWORD EXTNAME
+
+# ID     CHIPID xoffset yoffset xflip yflip datasec         biassec            Xo      Yo      theta
+nausicaa  XY01	      23      3     1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+kiki	  XY11        2121    2	    1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+fio	  XY21	      4221    0	    1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+sophie	  XY00	      0	      4207  1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+sheeta	  XY10	      2095    4229  1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+satsuki	  XY20	      4208    4254  1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+chihiro	  XY41	      8429    65    1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+clarisse  XY31	      6337    26    1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+ponyo	  XY40	      8405    4253  1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+san	  XY30	      6315    4252  1	  0 [520:2264,49:4225] [521:568,1:48]  0       0       0
+# can we use header to find biassec
+USE_BIASSEC 1
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_mef.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_mef.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_mef.config	(revision 37065)
@@ -0,0 +1,190 @@
+# The spliced MecaCam data is stored in single extensions for each chip
+
+# How to recognise this type
+RULE	METADATA
+	TELESCOP	STR	Subaru
+#	DETECTOR	STR	MegaCam
+	INSTRUME	STR	SuprimeCam
+#	NAXIS           S32     2
+	EXTEND		BOOL	T
+	PSMOSIAC	STR	CHIP
+#       HISTORY         STR     imsplice: Splicing results in all detectors as if read from A amplifier
+END
+
+FILE	METADATA
+	# How to read this data
+	PHU		STR	FPA	# The FITS file represents an entire FPA
+	EXTENSIONS	STR	CHIP	# The extensions represent chips
+	FPA.OBS		STR	EXP-ID	# A PHU keyword for unique identifier
+#	CONTENT		STR	DETECTOR	# Key to the CONTENTS menu
+#	CHIP.NAME	STR	DETECTOR
+#	CONTENT.RULE	STR	{CHIP.NAME} # How to derive the CONTENT when writing
+END
+
+# What's in the FITS file?
+CONTENTS	METADATA
+	# Extension name, chipName:chipType
+        nausicaa  STR   XY01:spcam20080721
+        kiki      STR   XY11:spcam20080721
+        fio       STR   XY21:spcam20080721
+        sophie    STR   XY00:spcam20080721
+        sheeta    STR   XY10:spcam20080721
+        satsuki   STR   XY20:spcam20080721
+        chihiro   STR   XY41:spcam20080721
+        clarisse  STR   XY31:spcam20080721
+        ponyo     STR   XY40:spcam20080721
+        san       STR   XY30:spcam20080721
+
+	XY01	STR	XY01:spcam20080721
+	XY11	STR	XY11:spcam20080721
+	XY21	STR	XY21:spcam20080721
+	XY00	STR	XY00:spcam20080721
+	XY10	STR	XY10:spcam20080721
+	XY20	STR	XY20:spcam20080721
+	XY41	STR	XY41:spcam20080721
+	XY31	STR	XY31:spcam20080721
+	XY40	STR	XY40:spcam20080721
+	XY30	STR	XY30:spcam20080721
+
+END
+
+# Specify the chips
+CHIPS		METADATA
+	# Chip type, cellName:cellType
+        spcam20080721  STR    cell:cell
+END
+
+
+# Specify the cells
+CELLS		METADATA
+	# Cell type, concepts to use
+        cell   METADATA
+               CELL.BIASSEC.SOURCE      STR     VALUE
+               CELL.TRIMSEC.SOURCE      STR     VALUE
+               CELL.BIASSEC             STR     [521:568,1:48]
+               CELL.TRIMSEC             STR     [520:2264,49:4225]
+               CELL.X0                  S32     0
+               CELL.GAIN.SOURCE         STR     HEADER
+               CELL.GAIN                STR     GAIN
+        END
+END
+
+# How to translate PS concepts into FITS headers
+TRANSLATION	METADATA
+	FPA.OBS		STR	EXP-ID
+        FPA.AIRMASS     STR     AIRMASS
+        FPA.FILTERID    STR     FILTER01
+        FPA.FILTER      STR     FILTER01
+	FPA.OBSTYPE	STR	DATA-TYP
+	FPA.OBJECT	STR	OBJECT
+	FPA.TIME	STR	MJD
+        FPA.RA          STR     RA
+        FPA.DEC         STR     DEC
+        FPA.RADECSYS    STR     RADECSYS
+        FPA.POSANGLE    STR     INST-PA
+	FPA.FOCUS	STR	TELFOCUS # added at start of 03Am04
+	FPA.ALT		STR	ALTITUDE
+	FPA.AZ		STR	AZIMUTH
+	FPA.TEMP	STR	DET-TMP
+	FPA.EXPOSURE	STR	EXPTIME
+	FPA.ZP		STR	ZPT_OBS
+	CHIP.TEMP	STR	DET-TMP
+        CELL.EXPOSURE   STR     EXPTIME
+        CELL.DARKTIME   STR     DARKTIME
+        CELL.READNOISE  STR     RDNOISE
+	CELL.TIME	STR	MJD
+        CELL.XBIN       STR     BIN-FCT1
+        CELL.YBIN       STR     BIN-FCT2
+END
+
+# Default PS concepts that may be specified by value
+DEFAULTS        METADATA
+	FPA.TELESCOPE		STR	Subaru
+	FPA.INSTRUMENT		STR	SuprimeCam
+	FPA.DETECTOR	        STR	kiki
+#	FPA.TIMESYS		STR	
+	CHIP.XSIZE		S32	2048
+	CHIP.YSIZE		S32	4224
+	CELL.XSIZE		S32	2048
+	CELL.YSIZE		S32	4224
+	CELL.XWINDOW		S32	0
+	CELL.YWINDOW		S32	0
+	CELL.READDIR		S32	1		# Cell is read in x direction
+        CELL.SATURATION		F32	50000.0
+        CELL.BAD                F32     0
+	CELL.XPARITY		S32	1
+	CELL.YPARITY		S32	1
+	CELL.Y0			S32	0
+#	CELL.TIMESYS		STR	UTC
+               CELL.TRIMSEC             STR     [1:2264,49:4225]
+	CHIP.X0.DEPEND		STR	CHIP.NAME
+	CHIP.X0		METADATA
+                XY01    S32     23
+                XY11    S32     2121
+                XY21    S32     4221
+                XY00    S32     0
+                XY10    S32     2095
+                XY20    S32     4208
+                XY41    S32     8429
+                XY31    S32     6337
+                XY40    S32     8405
+                XY30    S32     6315
+	END
+
+	CHIP.Y0.DEPEND		STR	CHIP.NAME
+	CHIP.Y0		METADATA
+                XY01    S32     3
+                XY11    S32     2
+                XY21    S32     0
+                XY00    S32     4207
+                XY10    S32     4229
+                XY20    S32     4254
+                XY41    S32     65
+                XY31    S32     26
+                XY40    S32     4253
+                XY30    S32     4252
+	END
+
+	CHIP.XPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.XPARITY	METADATA
+                XY01    S32     -1
+                XY11    S32     -1
+                XY21    S32     -1
+                XY00    S32     -1
+                XY10    S32     -1
+                XY20    S32     -1
+                XY41    S32     -1
+                XY31    S32     -1
+                XY40    S32     -1
+                XY30    S32     -1
+	END
+
+	CHIP.YPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.YPARITY	METADATA
+                XY01    S32     1
+                XY11    S32     1
+                XY21    S32     1
+                XY00    S32     1
+                XY10    S32     1
+                XY20    S32     1
+                XY41    S32     1
+                XY31    S32     1
+                XY40    S32     1
+                XY30    S32     1
+	END
+END
+
+
+# How to translation PS concepts into database lookups
+DATABASE	METADATA
+#	CELL.GAIN	STR	SELECT gain FROM camera WHERE chip_id = '{CHIP.NAME}' AND cell_id = '{CELL.NAME}'
+END		
+
+# Where there might be some ambiguity, specify the format
+FORMATS		METADATA
+	FPA.RA		STR	HOURS
+	FPA.DEC		STR	DEGREES
+	FPA.TIME	STR	MJD
+	CELL.TIME	STR	MJD
+END
+ 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_raw.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_raw.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_raw.config	(revision 37065)
@@ -0,0 +1,223 @@
+# The split MecaCam data is stored as single files for each chip, each a simple fits image
+
+# How to recognise this type
+RULE	METADATA
+	TELESCOP	STR	Subaru
+	INSTRUME	STR	SuprimeCam
+	NAXIS           S32     2
+        NAXIS1          S32     2272
+        NAXIS2          S32     4273
+END
+
+FILE	METADATA
+	# How to read this data
+	PHU		STR	CHIP	# The FITS file represents a chip
+	EXTENSIONS	STR	NONE	# There are no extensions
+	FPA.OBS		STR	EXP-ID	# A PHU keyword for unique identifier
+	CONTENT		STR	DETECTOR	# Key to the CONTENTS menu
+	CONTENT.RULE	STR	{CHIP.NAME} # How to derive the CONTENT when writing
+END
+
+# What's in the FITS file?
+CONTENTS	METADATA
+	# Content name, chipType
+	nausicaa  STR	XY01_raw:spcam20080721
+	kiki	  STR	XY11_raw:spcam20080721
+	fio	  STR	XY21_raw:spcam20080721
+	sophie	  STR	XY00_raw:spcam20080721
+	sheeta	  STR	XY10_raw:spcam20080721
+	satsuki	  STR	XY20_raw:spcam20080721
+	chihiro	  STR	XY41_raw:spcam20080721
+	clarisse  STR	XY31_raw:spcam20080721
+	ponyo	  STR	XY40_raw:spcam20080721
+	san	  STR	XY30_raw:spcam20080721
+END
+
+# Specify the chips
+CHIPS		METADATA
+	# Chip type, cellName:cellType
+	spcam20080721 METADATA
+	  ch1 STR ch1:ch1
+	  ch2 STR ch2:ch2
+	  ch3 STR ch4:ch3
+	  ch4 STR ch4:ch4
+	END
+END
+
+
+# Specify the cells
+CELLS		METADATA
+	# Cell type, concepts for this type
+	ch1   METADATA
+	       CELL.BIASSEC.SOURCE	STR	VALUE
+	       CELL.TRIMSEC.SOURCE	STR	VALUE
+	       CELL.BIASSEC		STR	[521:568,1:48]
+	       CELL.TRIMSEC		STR	[9:520:49,4225]
+	       CELL.X0 			S32	0
+	       CELL.GAIN.SOURCE 	STR 	HEADER
+	       CELL.GAIN	 	STR	GAIN
+	END
+	# Cell type, concepts for this type
+	ch2   METADATA
+	       CELL.BIASSEC.SOURCE	STR	VALUE
+	       CELL.TRIMSEC.SOURCE	STR	VALUE
+	       CELL.BIASSEC		STR	[569:616,1:48]
+	       CELL.TRIMSEC		STR	[617:1128,49:4225]
+	       CELL.X0 			S32	0
+	       CELL.GAIN.SOURCE 	STR 	HEADER
+	       CELL.GAIN	 	STR	GAIN
+	END
+	# Cell type, concepts for this type
+	ch3   METADATA
+	       CELL.BIASSEC.SOURCE	STR	VALUE
+	       CELL.TRIMSEC.SOURCE	STR	VALUE
+	       CELL.BIASSEC		STR	[1657:1704,1:48]
+	       CELL.TRIMSEC		STR	[1145:1656,49:4225]
+	       CELL.X0 			S32	0
+	       CELL.GAIN.SOURCE 	STR 	HEADER
+	       CELL.GAIN	 	STR	GAIN
+	END
+	# Cell type, concepts for this type
+	ch4   METADATA
+	       CELL.BIASSEC.SOURCE	STR	VALUE
+	       CELL.TRIMSEC.SOURCE	STR	VALUE
+	       CELL.BIASSEC		STR	[1705:1752,1:48]
+	       CELL.TRIMSEC		STR	[1753:2264,49:4225]
+	       CELL.X0 			S32	0
+	       CELL.GAIN.SOURCE 	STR 	HEADER
+	       CELL.GAIN	 	STR	GAIN
+	END
+END
+
+# How to translate PS concepts into FITS headers
+TRANSLATION	METADATA
+        FPA.OBS         STR     EXP-ID
+	FPA.DETECTOR    STR	DETECTOR
+        FPA.AIRMASS     STR     AIRMASS
+        FPA.FILTER      STR     FILTER01
+        FPA.FILTERID    STR     FILTER01
+        FPA.POSANGLE    STR     INST-PA
+        FPA.RA          STR     RA
+        FPA.DEC         STR     DEC
+        FPA.RADECSYS    STR     RADECSYS
+	FPA.OBSTYPE	STR	DATA-TYP
+	FPA.OBJECT	STR	OBJECT
+	FPA.FOCUS	STR	FOC-VAL
+	FPA.TIME	STR	MJD
+	FPA.TIMESYS	STR	TIMESYS
+	FPA.ALT		STR	ALTITUDE
+	FPA.AZ		STR	AZIMUTH
+	FPA.TEMP	STR	DET-TMP
+	FPA.EXPOSURE	STR	EXPTIME
+	CHIP.TEMP	STR	DET-TMP
+        CELL.EXPOSURE   STR     EXPTIME
+        CELL.DARKTIME   STR     DARKTIME
+#       CELL.READNOISE  STR     RDNOISE
+	CELL.TIME	STR	MJD
+	CELL.TIMESYS	STR	TIMESYS
+        CELL.XBIN       STR     BIN-FCT1
+        CELL.YBIN       STR     BIN-FCT2
+
+        # FPA.TELTEMP.M1     STR  TELTEMM1 # Primary mirror temps (C) 
+        # FPA.TELTEMP.M1CELL STR  TELTEMMS # Primary mirror support temps (C)   
+        # FPA.TELTEMP.M2     STR  TELTEMM2 # Secondary mirror temps (C
+        # FPA.TELTEMP.SPIDER STR  TELTEMSP # Spider temperatures (C)  
+        FPA.TELTEMP.TRUSS  STR  DOM-TMP # Mid truss temperatures (C
+        FPA.TELTEMP.EXTRA  STR  OUT-TMP # Miscellaneous temperatures (C)     
+END
+
+# Default PS concepts that may be specified by value
+DEFAULTS        METADATA
+	FPA.TELESCOPE		STR	Subaru
+	FPA.INSTRUMENT		STR	SuprimeCam
+	CHIP.XSIZE		S32	2048
+	CHIP.YSIZE		S32	4224
+	CELL.XSIZE		S32	2048
+	CELL.YSIZE		S32	4224
+	CELL.XWINDOW		S32	0
+	CELL.YWINDOW		S32	0
+        CELL.SATURATION         S32     60000
+	CELL.READDIR		S32	1		# Cell is read in x direction
+        CELL.SATURATION		F32	50000.0
+        CELL.READNOISE          F32     5.0  # XXX wild guess
+        CELL.BAD                F32     0
+	CELL.XPARITY		S32	1
+	CELL.YPARITY		S32	1
+	CELL.Y0			S32	0
+	CHIP.X0.DEPEND		STR	CHIP.NAME
+
+	CHIP.X0		METADATA
+		XY01	S32	23
+		XY11	S32	2121
+		XY21	S32	4221
+		XY00	S32	0
+		XY10	S32	2095
+		XY20	S32	4208
+		XY41	S32	8429
+		XY31	S32	6337
+		XY40	S32	8405
+		XY30	S32	6315
+	END
+	CHIP.Y0.DEPEND		STR	CHIP.NAME
+	CHIP.Y0		METADATA
+		XY01	S32	3
+		XY11	S32	2
+		XY21	S32	0
+		XY00	S32	4207
+		XY10	S32	4229
+		XY20	S32	4254
+		XY41	S32	65
+		XY31	S32	26
+		XY40	S32	4253
+		XY30	S32	4252		
+	END
+
+	CHIP.XPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.XPARITY	METADATA
+		XY01	S32	-1
+		XY11	S32	-1
+		XY21	S32	-1
+		XY00	S32 	-1
+		XY10	S32	-1
+		XY20	S32	-1
+		XY41	S32	-1
+		XY31	S32	-1
+		XY40	S32	-1
+		XY30	S32	-1
+	END
+	CHIP.YPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.YPARITY	METADATA
+		XY01	S32	1
+		XY11	S32	1
+		XY21	S32	1
+		XY00	S32 	1
+		XY10	S32	1
+		XY20	S32	1
+		XY41	S32	1
+		XY31	S32	1
+		XY40	S32	1
+		XY30	S32	1
+	END
+END
+
+
+# How to translation PS concepts into database lookups
+DATABASE	METADATA
+	TYPE		dbEntry		TABLE		COLUMN		GIVENDBCOL	GIVENPS
+#	CELL.GAIN	dbEntry		Camera		gain		chipId,cellId	CHIP.NAME,CELL.NAME
+#	CELL.READNOISE	dbEntry		Camera		readNoise	chipId,cellId	CHIP.NAME,CELL.NAME
+
+# A database entry refers to a particular column (COLUMN) in a
+# particular table (TABLE), given certain PS concepts (GIVENPS) that
+# match certain database columns (GIVENDBCOL).
+END		
+
+
+# Where there might be some ambiguity, specify the format
+FORMATS		METADATA
+	FPA.RA		STR	HOURS
+	FPA.DEC		STR	DEGREES
+	FPA.TIME	STR	MJD
+	CELL.TIME	STR	MJD
+END
+ 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_split.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_split.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/format_split.config	(revision 37065)
@@ -0,0 +1,199 @@
+# The split MecaCam data is stored as single files for each chip, each a simple fits image
+
+# How to recognise this type
+RULE	METADATA
+	TELESCOP	STR	Subaru
+	INSTRUME	STR	SuprimeCam
+	OBSERVAT	STR	NAOJ
+#	NAXIS           S32     2
+END
+
+FILE	METADATA
+	# How to read this data
+	PHU		STR	CHIP	# The FITS file represents a chip
+	EXTENSIONS	STR	NONE	# There are no extensions
+	FPA.OBS		STR	EXP-ID	# A PHU keyword for unique identifier
+	CONTENT		STR	DETECTOR	# Key to the CONTENTS menu
+	CONTENT.RULE	STR	{CHIP.NAME} # How to derive the CONTENT when writing
+END
+
+# What's in the FITS file?
+CONTENTS	METADATA
+	# Content name, chipType
+	nausicaa  STR	XY01:spcam20080721
+	kiki	  STR	XY11:spcam20080721
+	fio	  STR	XY21:spcam20080721
+	sophie	  STR	XY00:spcam20080721
+	sheeta	  STR	XY10:spcam20080721
+	satsuki	  STR	XY20:spcam20080721
+	chihiro	  STR	XY41:spcam20080721
+	clarisse  STR	XY31:spcam20080721
+	ponyo	  STR	XY40:spcam20080721
+	san	  STR	XY30:spcam20080721
+
+	XY01	STR	XY01:spcam20080721
+	XY11	STR	XY11:spcam20080721
+	XY21	STR	XY21:spcam20080721
+	XY00	STR	XY00:spcam20080721
+	XY10	STR	XY10:spcam20080721
+	XY20	STR	XY20:spcam20080721
+	XY41	STR	XY41:spcam20080721
+	XY31	STR	XY31:spcam20080721
+	XY40	STR	XY40:spcam20080721
+	XY30	STR	XY30:spcam20080721
+END
+
+# Specify the chips
+CHIPS		METADATA
+	# Chip type, cellName:cellType
+	spcam20080721  STR    Cell:cell
+END
+
+
+# Specify the cells
+CELLS		METADATA
+	# Cell type, concepts for this type
+	cell   METADATA
+	       CELL.BIASSEC.SOURCE	STR	VALUE
+	       CELL.TRIMSEC.SOURCE	STR	VALUE
+	       CELL.BIASSEC		STR	[0:0,0:0]
+#	       CELL.TRIMSEC		STR	[1:2048,1:4225]
+	       CELL.TRIMSEC		STR	[1:2048,1:4177]
+	       CELL.X0 			S32	0
+	       CELL.GAIN.SOURCE 	STR 	HEADER
+	       CELL.GAIN	 	STR	GAIN
+	END
+END
+
+# How to translate PS concepts into FITS headers
+TRANSLATION	METADATA
+        FPA.OBS         STR     EXP-ID
+	FPA.DETECTOR    STR	DETECTOR
+        FPA.AIRMASS     STR     AIRMASS
+        FPA.FILTER      STR     FILTER01
+        FPA.FILTERID    STR     FILTER01
+        FPA.POSANGLE    STR     INST-PA
+        FPA.RA          STR     RA
+        FPA.DEC         STR     DEC
+        FPA.RADECSYS    STR     RADECSYS
+	FPA.OBSTYPE	STR	DATA-TYP
+	FPA.OBJECT	STR	OBJECT
+	FPA.FOCUS	STR	FOC-VAL
+	FPA.TIME	STR	MJD
+	FPA.TIMESYS	STR	TIMESYS
+	FPA.ALT		STR	ALTITUDE
+	FPA.AZ		STR	AZIMUTH
+	FPA.TEMP	STR	DET-TMP
+	FPA.EXPOSURE	STR	EXPTIME
+	CHIP.TEMP	STR	DET-TMP
+        CELL.EXPOSURE   STR     EXPTIME
+        CELL.DARKTIME   STR     DARKTIME
+#       CELL.READNOISE  STR     RDNOISE
+	CELL.TIME	STR	MJD
+	CELL.TIMESYS	STR	TIMESYS
+        CELL.XBIN       STR     BIN-FCT1
+        CELL.YBIN       STR     BIN-FCT2
+
+        # FPA.TELTEMP.M1     STR  TELTEMM1 # Primary mirror temps (C) 
+        # FPA.TELTEMP.M1CELL STR  TELTEMMS # Primary mirror support temps (C)   
+        # FPA.TELTEMP.M2     STR  TELTEMM2 # Secondary mirror temps (C
+        # FPA.TELTEMP.SPIDER STR  TELTEMSP # Spider temperatures (C)  
+        FPA.TELTEMP.TRUSS  STR  DOM-TMP # Mid truss temperatures (C
+        FPA.TELTEMP.EXTRA  STR  OUT-TMP # Miscellaneous temperatures (C)     
+END
+
+# Default PS concepts that may be specified by value
+DEFAULTS        METADATA
+	FPA.TELESCOPE		STR	Subaru
+	FPA.INSTRUMENT		STR	SuprimeCam
+	CHIP.XSIZE		S32	2048
+	CHIP.YSIZE		S32	4224
+	CELL.XSIZE		S32	2048
+	CELL.YSIZE		S32	4224
+	CELL.XWINDOW		S32	0
+	CELL.YWINDOW		S32	0
+        CELL.SATURATION         S32     60000
+	CELL.READDIR		S32	1		# Cell is read in x direction
+        CELL.SATURATION		F32	50000.0
+        CELL.READNOISE          F32     5.0  # XXX wild guess
+        CELL.BAD                F32     0
+	CELL.XPARITY		S32	1
+	CELL.YPARITY		S32	1
+	CELL.Y0			S32	0
+	CHIP.X0.DEPEND		STR	CHIP.NAME
+
+	CHIP.X0		METADATA
+		XY01	S32	23
+		XY11	S32	2121
+		XY21	S32	4221
+		XY00	S32	0
+		XY10	S32	2095
+		XY20	S32	4208
+		XY41	S32	8429
+		XY31	S32	6337
+		XY40	S32	8405
+		XY30	S32	6315
+	END
+	CHIP.Y0.DEPEND		STR	CHIP.NAME
+	CHIP.Y0		METADATA
+		XY01	S32	3
+		XY11	S32	2
+		XY21	S32	0
+		XY00	S32	4207
+		XY10	S32	4229
+		XY20	S32	4254
+		XY41	S32	65
+		XY31	S32	26
+		XY40	S32	4253
+		XY30	S32	4252		
+	END
+
+	CHIP.XPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.XPARITY	METADATA
+		XY01	S32	-1
+		XY11	S32	-1
+		XY21	S32	-1
+		XY00	S32 	-1
+		XY10	S32	-1
+		XY20	S32	-1
+		XY41	S32	-1
+		XY31	S32	-1
+		XY40	S32	-1
+		XY30	S32	-1
+	END
+	CHIP.YPARITY.DEPEND	STR	CHIP.NAME
+	CHIP.YPARITY	METADATA
+		XY01	S32	1
+		XY11	S32	1
+		XY21	S32	1
+		XY00	S32 	1
+		XY10	S32	1
+		XY20	S32	1
+		XY41	S32	1
+		XY31	S32	1
+		XY40	S32	1
+		XY30	S32	1
+	END
+END
+
+
+# How to translation PS concepts into database lookups
+DATABASE	METADATA
+	TYPE		dbEntry		TABLE		COLUMN		GIVENDBCOL	GIVENPS
+#	CELL.GAIN	dbEntry		Camera		gain		chipId,cellId	CHIP.NAME,CELL.NAME
+#	CELL.READNOISE	dbEntry		Camera		readNoise	chipId,cellId	CHIP.NAME,CELL.NAME
+
+# A database entry refers to a particular column (COLUMN) in a
+# particular table (TABLE), given certain PS concepts (GIVENPS) that
+# match certain database columns (GIVENDBCOL).
+END		
+
+
+# Where there might be some ambiguity, specify the format
+FORMATS		METADATA
+	FPA.RA		STR	HOURS
+	FPA.DEC		STR	DEGREES
+	FPA.TIME	STR	MJD
+	CELL.TIME	STR	MJD
+END
+ 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppImage.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppImage.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppImage.config	(revision 37065)
@@ -0,0 +1,193 @@
+### ppImage recipe configuration file for Megacam
+
+# Overscan subtraction
+OVERSCAN.SINGLE		BOOL	FALSE		# Reduce overscan to a single value?
+OVERSCAN.FIT		STR	NONE		# NONE | POLYNOMIAL | SPLINE
+OVERSCAN.ORDER		S32	0		# Order of polynomial fit
+OVERSCAN.STAT		STR	MEAN		# MEAN | MEDIAN
+
+# for a test, turn off selected detrend types
+OVERSCAN	BOOL	FALSE		# Overscan subtraction
+BIAS		BOOL	TRUE		# Bias subtraction
+DARK		BOOL	FALSE		# Dark subtraction
+FLAT		BOOL	TRUE		# Flat-field normalisation
+
+# binned output image options
+BIN1.XBIN               S32     18
+BIN1.YBIN               S32     18
+BIN2.XBIN               S32     144
+BIN2.YBIN               S32     144
+
+# megacam needs fringe subtraction
+FRINGE		BOOL	TRUE		# Fringe subtraction
+
+USE.DEBURNED.IMAGE	BOOL	FALSE  # Skip burntool
+
+# this table lists extra constraints which should be applied when
+# selecting the detrend images.
+# note: camera and time are always applied
+
+DETREND.CONSTRAINTS  METADATA
+  BIAS METADATA
+  END
+  DARK METADATA
+#   EXPTIME STR FPA.EXPOSURE
+  END
+  FLAT METADATA
+    FILTER  STR FPA.FILTERID
+#   DETTYPE STR DOMEFLAT.RAW
+#   VERSION STR SKYFLAT.RAW
+#   VERSION STR DOMEFLAT.CORR.XX
+#   VERSION STR SKYFLAT.CORR
+  END
+  FLAT_CORRECTION METADATA
+    FILTER   STR FPA.FILTER
+  END
+  FRINGE METADATA
+    FILTER   STR FPA.FILTER
+#   AIRMASS  STR FPA.AIRMASS
+#   TWILIGHT STR FPA.TWILIGHT
+  END
+  SHUTTER METADATA
+  END
+  MASK METADATA
+  END	
+END
+
+# only apply the fringe for these filters
+FRINGE.FILTERS  MULTI
+FRINGE.FILTERS	STR i
+FRINGE.FILTERS	STR z
+
+
+# Standard chip processing
+CHIP    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
+  BIAS             BOOL    TRUE            # Bias subtraction
+  DARK             BOOL    FALSE           # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    TRUE            # Flat-field normalisation
+  MASK             BOOL    FALSE            # 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?
+END
+
+# Overscan, bias, dark, shutter
+PPIMAGE_OBDS       METADATA
+  BASE.FITS        BOOL    TRUE            # Save base detrended image?
+  BASE.MASK.FITS   BOOL    TRUE            # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    TRUE            # 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? 
+  OVERSCAN         BOOL    TRUE            # Overscan subtraction
+  BIAS             BOOL    TRUE            # Bias subtraction
+  DARK             BOOL    FALSE           # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    FALSE           # Flat-field normalisation
+  MASK             BOOL    FALSE           # Mask bad pixels
+  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
+
+# Overscan, bias, dark, shutter, flat-field
+PPIMAGE_OBDSF      METADATA
+  BASE.FITS        BOOL    TRUE            # Save base detrended image?
+  BASE.MASK.FITS   BOOL    TRUE            # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    TRUE            # 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? 
+  OVERSCAN         BOOL    TRUE           # Overscan subtraction
+  BIAS             BOOL    TRUE            # Bias subtraction
+  DARK             BOOL    FALSE           # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    TRUE            # Flat-field normalisation
+  MASK             BOOL    FALSE           # Mask bad pixels
+  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
+
+# Overscan, bias, dark, shutter, flat-field, fringe
+PPIMAGE_OBDSFR     METADATA
+  BASE.FITS        BOOL    TRUE            # Save base detrended image?
+  BASE.MASK.FITS   BOOL    TRUE            # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    TRUE            # 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? 
+  OVERSCAN         BOOL    TRUE            # Overscan subtraction
+  BIAS             BOOL    TRUE            # Bias subtraction
+  DARK             BOOL    FALSE           # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    TRUE            # Flat-field normalisation
+  MASK             BOOL    FALSE           # Mask bad pixels
+  FRINGE           BOOL    TRUE            # 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
+
+# Overscan, bias, dark, shutter, flat-field, fringe, photom
+PPIMAGE_OBDSFRP    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
+  BIAS             BOOL    TRUE            # Bias subtraction
+  DARK             BOOL    FALSE           # 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?
+END
+
+# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom
+PPIMAGE_OBDSFRA    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
+  BIAS             BOOL    TRUE            # Bias subtraction
+  DARK             BOOL    FALSE           # 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?
+END 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppMerge.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppMerge.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppMerge.config	(revision 37065)
@@ -0,0 +1,40 @@
+
+# Bias combination --- don't want min/max rejection
+PPMERGE_BIAS	METADATA
+   REJ		F32	3.0		# Rejection threshold (sigma)
+   ITER		S32	2		# Number of rejection iterations
+   FRACHIGH	F32	0.0		# Fraction of high pixels to reject immediately
+   FRACLOW	F32	0.0		# Fraction of low pixels to reject immediately
+   WEIGHTS	BOOL	FALSE		# Use image weights?
+   COMBINE	STR	CLIPPED		# Statistic to use for combination: 
+END
+
+# Dark combination --- don't want min/max rejection
+# More aggressive clipping than bias, so as to remove CRs
+PPMERGE_DARK	METADATA
+  REJ		F32	2.0		# Rejection threshold (sigma)
+  ITER		S32	4		# Number of rejection iterations
+  FRACHIGH	F32	0.0		# Fraction of high pixels to reject immediately
+  FRACLOW	F32	0.0		# Fraction of low pixels to reject immediately
+  WEIGHTS	BOOL	FALSE		# Use image weights?
+  COMBINE	STR	CLIPPED		# Statistic to use for combination: 
+END
+
+# Flat combination --- use min/max rejection
+PPMERGE_FLAT	METADATA
+	REJ		F32	3.0		# Rejection threshold (sigma)
+	ITER		S32	1		# Number of rejection iterations
+	FRACHIGH	F32	0.3		# Fraction of high pixels to reject immediately
+	FRACLOW		F32	0.1		# Fraction of low pixels to reject immediately
+	NKEEP		S32	5		# Minimum number of pixels in stack to keep
+	WEIGHTS		BOOL	FALSE		# Use image weights?
+	COMBINE		STR	MEAN		# Statistic to use for combination: 
+END
+
+
+# Fringe combination --- already included in default, above
+PPMERGE_FRINGE	METADATA
+	FRACHIGH	F32	0.1		# Fraction of high pixels to reject immediately
+	WEIGHTS		BOOL	FALSE		# Use image weights?
+END
+
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppStack.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppStack.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/ppStack.config	(revision 37065)
@@ -0,0 +1,2 @@
+    CONVOLVE        BOOL   FALSE    
+# we don't need this for megacam
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/psastro.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/psastro.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/psastro.config	(revision 37065)
@@ -0,0 +1,195 @@
+
+# save matched stars?
+PSASTRO.SAVE.REFMATCH      BOOL TRUE  # save refstar matches as table in output smf file
+
+# astrometry matching parameters
+
+# nominal plate scale (microns / pixel)
+PSASTRO.PIXEL.SCALE    F32  1.0
+
+# pmAstromGridAngle
+# max grid offset in FP units (microns)
+# use plate-scale to make this in pixels?
+PSASTRO.GRID.OFFSET    F32     750.
+PSASTRO.GRID.SCALE     F32      50.
+
+# extra field for ref stars:
+PSASTRO.FIELD.PADDING  F32 0.25
+
+# pmAstromGridMatch parameters
+PSASTRO.GRID.MIN.ANGLE F32 -0.5 # start angle (degrees)
+PSASTRO.GRID.MAX.ANGLE F32 +0.5
+PSASTRO.GRID.DEL.ANGLE F32  0.25
+
+PSASTRO.GRID.MIN.SCALE F32  0.96
+PSASTRO.GRID.MAX.SCALE F32  1.04
+PSASTRO.GRID.DEL.SCALE F32  0.02
+
+# these tweak are in FP units (pixels, currently)
+PSASTRO.TWEAK.SCALE     F32      1
+PSASTRO.TWEAK.RANGE     F32      150
+PSASTRO.TWEAK.SMOOTH    F32      2
+PSASTRO.TWEAK.NSIGMA    F32      3
+
+# single-chip radius match in pixels
+PSASTRO.MATCH.FIT.NITER S32   5
+PSASTRO.MATCH.RADIUS    F32   100.0
+PSASTRO.MATCH.RADIUS.N0 F32   100.0
+PSASTRO.MATCH.RADIUS.N1 F32   60.0
+PSASTRO.MATCH.RADIUS.N2 F32   40.0
+PSASTRO.MATCH.RADIUS.N3 F32   30.0
+PSASTRO.MATCH.RADIUS.N4 F32   20.0
+PSASTRO.MATCH.UNIQ.ITER S32   4
+PSASTRO.CHIP.ORDER	S32   1
+
+PSASTRO.MAX.NRAW       S32      1500   # max stars accepted for fitting (0 for all)
+PSASTRO.MAX.NREF       S32      1500   # max stars accepted for fitting (0 for all)
+
+PSASTRO.MIN.INST.MAG.RAW       F32      -20.0  # min instrumental magnitude for stars accepted for fitting
+PSASTRO.MAX.INST.MAG.RAW       F32      -11.5  # max instrumental magnitude for stars accepted for fitting
+PSASTRO.GRID.MIN.INST.MAG.RAW  F32      -20.0  # min instrumental magnitude for stars accepted for grid search
+PSASTRO.GRID.MAX.INST.MAG.RAW  F32      -11.5  # max instrumental magnitude for stars accepted for grid search
+PSASTRO.GRID.MIN.SIGMA 	       F32  1.0
+
+PSASTRO.MAX.ERROR      F32      10.0 # max error in pixels
+PSASTRO.MIN.NSTAR      S32      5   # min fitted stars in solution
+
+PSASTRO.MAX.ALLOWED.FWHM      F32       25
+
+PSASTRO.MOSAIC.MODE           BOOL     TRUE
+
+# for iterations >= N, require a single match per reference
+PSASTRO.MOSAIC.CHIP.NITER     S32      5  # fit clipping iterations
+PSASTRO.MOSAIC.CHIP.NSIGMA    F32      3  # fit clipping sigmas
+PSASTRO.MOSAIC.UNIQ.ITER      S32      3
+
+PSASTRO.MOSAIC.MAX.ERROR.N0 F32    1.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N1 F32    1.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N2 F32    1.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N3 F32    1.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N4 F32    2.00 # max allow error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N5 F32    5.00 # max allow error for valid solution (arcsec)
+
+PSASTRO.MOSAIC.RADIUS.N0    F32    40.0
+PSASTRO.MOSAIC.RADIUS.N1    F32    35.0 # do not refine the match
+PSASTRO.MOSAIC.RADIUS.N2    F32    30.0 # do not refine the match
+PSASTRO.MOSAIC.RADIUS.N3    F32    25.0 
+PSASTRO.MOSAIC.RADIUS.N4    F32    20.0 
+PSASTRO.MOSAIC.RADIUS.N5    F32    10.0 
+
+PSASTRO.MOSAIC.CHIP.ORDER     S32      1
+PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      1 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N1  S32      2 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N2  S32      2 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      2 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N4  S32      2 # fit order (-1 means use default)
+PSASTRO.MOSAIC.CHIP.ORDER.N5  S32      2 # fit order (-1 means use default)
+
+PSASTRO.MOSAIC.GRADIENT.NX    S32      5   # number of x-dir cells per chip
+PSASTRO.MOSAIC.GRADIENT.NY    S32      5   # number of y-dir cells per chip
+
+# use this recipe to set a tight constraint
+PSASTRO.FINE METADATA
+  PSASTRO.MOSAIC.MAX.ERROR.N0 F32    1.50 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N1 F32    1.50 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.90 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.90 # max allow error for valid solution (arcsec)
+
+  PSASTRO.MOSAIC.RADIUS.N0    F32    8.0
+  PSASTRO.MOSAIC.RADIUS.N1    F32    0.0
+  PSASTRO.MOSAIC.RADIUS.N2    F32    4.0
+  PSASTRO.MOSAIC.RADIUS.N3    F32    4.0
+
+  PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N1  S32      1 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N2  S32      1 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      1 # fit order (-1 means use default)
+END
+
+# use this recipe to set a tight constraint
+PSASTRO_COARSE METADATA
+  PSASTRO.GRID.SCALE          F32     50.0
+  PSASTRO.TWEAK.RANGE         F32      1.0
+
+  DVO.GETSTAR.MIN.MAG         F32     10.0
+  DVO.GETSTAR.MAX.RHO         F32  12000.0
+
+  PSASTRO.MAX.INST.MAG.RAW       F32 -9.0  # max instrumental magnitude for stars accepted for fitting
+  PSASTRO.GRID.MAX.INST.MAG.RAW  F32 -9.0  # max instrumental magnitude for stars accepted for grid search
+
+  PSASTRO.GRID.MIN.SIGMA      F32    4.0
+
+  PSASTRO.MATCH.FIT.NITER S32   4
+  PSASTRO.MATCH.RADIUS.N0 F32   60.0
+  PSASTRO.MATCH.RADIUS.N1 F32   30.0
+  PSASTRO.MATCH.RADIUS.N2 F32   15.0
+  PSASTRO.MATCH.RADIUS.N3 F32    8.0
+
+  PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.0 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.0 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.0 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.0 # max allow error for valid solution (arcsec)
+  PSASTRO.MOSAIC.MAX.ERROR.N3 F32    2.0 # max allow error for valid solution (arcsec)
+
+  PSASTRO.MOSAIC.RADIUS.N0    F32   60.0
+  PSASTRO.MOSAIC.RADIUS.N1    F32   30.0
+  PSASTRO.MOSAIC.RADIUS.N2    F32   15.0
+  PSASTRO.MOSAIC.RADIUS.N3    F32    8.0
+  PSASTRO.MOSAIC.RADIUS.N4    F32    4.0
+
+  PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N1  S32      1 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N2  S32      1 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      1 # fit order (-1 means use default)
+  PSASTRO.MOSAIC.CHIP.ORDER.N4  S32      1 # fit order (-1 means use default)
+END
+
+PSASTRO.CATDIR              STR      PS1.REF.20120524
+DVO.GETSTAR.MAX.RHO         F32      30000.0
+DVO.GETSTAR.MIN.MAG         F32      -10.0
+DVO.GETSTAR.MIN.MAG.INST    F32     -40.0
+
+# we match the FILTER.ID (corresponding to the FILTER, see camera.config) to the dvo db PHOTCODE
+PHOTCODE.DATA MULTI
+PHOTCODE.DATA METADATA
+  FILTER   STR u
+  ZEROPT   F32 23.6
+  PHOTCODE STR g
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR g
+  ZEROPT   F32 26.46
+  PHOTCODE STR g
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR r
+  ZEROPT   F32 25.98
+  PHOTCODE STR r
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR i
+  ZEROPT   F32 25.74
+  PHOTCODE STR i
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR z
+  ZEROPT   F32 24.80
+  PHOTCODE STR z
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR Vr
+  ZEROPT   F32 25.0
+  PHOTCODE STR g
+END
+PHOTCODE.DATA METADATA
+  FILTER   STR Rc
+  ZEROPT   F32 25.0
+  PHOTCODE STR r
+END
+
+# plotting options
+PSASTRO.PLOT.INST.MAG.MAX F32 -9.0
+PSASTRO.PLOT.INST.MAG.MIN F32 -17.0
+PSASTRO.PLOT.REF.MAG.MIN  F32 +10.0
+PSASTRO.PLOT.REF.MAG.MAX  F32 +25.0
+
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/psphot.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/psphot.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/psphot.config	(revision 37065)
@@ -0,0 +1,30 @@
+
+# turn these on to see specific outputs
+SAVE.PLOTS     	BOOL    FALSE
+
+# PSF model parameters : choose the PSF model desired
+# PSF_MODEL           STR  PS_MODEL_QGAUSS
+PSF_MODEL           STR  PS_MODEL_PS1_V1
+# PSF_MODEL           STR  PS_MODEL_RGAUSS
+
+PSF.TREND.MODE STR MAP
+PSF.TREND.NX   S32 1
+PSF.TREND.NY   S32 1
+PSF_SN_LIM F32 5              # minimum S/N for stars used for PSF model
+
+PEAKS_SMOOTH_SIGMA F32 2.5             # smoothing kernel sigma in pixels
+PEAKS_NSIGMA_LIMIT F32 5.0            # peak significance threshold
+MOMENTS_SCALE F32 0.1 # PSFs are generally small, avoid the CRs
+
+PSF_FIT_RADIUS_SCALE F32 10.0 # fitting radius for test PSF model
+
+PSPHOT.CRMASK.APPLY BOOL  TRUE		  # TEST THIS before enabling.
+
+MOMENTS_SX_MIN                      F32   1.0
+MOMENTS_SY_MIN                      F32   1.0
+                                                                                                                                                              
+BACKGROUND.XBIN                     S32   400             # size of background superpixels
+BACKGROUND.YBIN                     S32   400             # size of background superpixels
+BACKGROUND.XSAMPLE                  F32   2.0             # size of background superpixels
+BACKGROUND.YSAMPLE                  F32   2.0             # size of background superpixels
+IMSTATS_NPIX                        S32   40000           # number of pixels to use for sky estimate boxes:
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/pswarp.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/pswarp.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/pswarp.config	(revision 37065)
@@ -0,0 +1,3 @@
+### Megacam recipe for pswarp
+
+ASTROM.SOURCE	STR	PSASTRO.OUTPUT	# Source file rule for astrometry, or NULL
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/rejections.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/rejections.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/suprime/rejections.config	(revision 37065)
@@ -0,0 +1,38 @@
+
+BIAS METADATA
+  FILTER      	     STR  *
+  EXPECTED    	     F32  0.0
+  IMFILE.MEAN 	     F32  2.0
+  IMFILE.STDEV       F32 10.0
+  IMFILE.MEANSTDEV   F32  0.5
+  IMFILE.SKEWNESS    F32  0.0
+  IMFILE.KURTOSIS    F32  0.0
+  IMFILE.SNR         F32  0.0
+  IMFILE.BIN.STDEV   F32  0.5
+  IMFILE.BIN.SNR     F32  0.0
+  IMFILE.FLUX        F32  0.0
+  EXP.MEAN           F32  1.0
+  EXP.STDEV          F32 10.0
+  EXP.MEANSTDEV      F32  0.5
+  EXP.SNR            F32  0.0
+  EXP.BIN.STDEV      F32  0.0
+  EXP.BIN.SNR        F32  0.0
+  EXP.FLUX           F32  0.0
+  ENSEMBLE.MEAN      F32  3.0
+  ENSEMBLE.STDEV     F32  3.0
+  ENSEMBLE.MEANSTDEV F32  0.0
+END
+
+# FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything
+# EXPECTED is the expected mean value
+# IMFILE.MEAN is the maximum permitted mean value for an imfile, relative to the standard deviation
+# IMFILE.STDEV is the maximum permitted standard deviation for an imfile
+# EXP.MEAN is the maximum permitted mean value for an exposure, relative to the standard deviation
+# EXP.STDEV is the maximum permitted standard deviation for an exposure
+# EXP.MEANSTDEV is the maximum permitted mean standard deviation for an exposure relative to the mean
+# ENSEMBLE.MEAN is the maximum permitted mean for an ensemble of exposures
+# ENSEMBLE.STDEV is the maximum permitted standard deviation for an ensemble of exposures
+# ENSEMBLE.MEANSTDEV is the maximum permitted mean standard deviation for an ensemble of exposures
+# IMFILE.SNR is the minimum permitted signal-to-noise for an imfile
+# EXP.SNR is the minimum permitted signal-to-noise for an exposure
+# These values (all except FILTER) may be zero, in which case no clipping is applied.
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/system.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/system.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/system.config	(revision 37065)
@@ -11,4 +11,5 @@
 	GPC1			STR	gpc1/camera.config		# Pan-STARRS GPC1
 	GPC1-TDI		STR	gpc1-tdi/camera.config		# Pan-STARRS GPC1 with TDI guiding
+	TC3			STR	tc3/camera.config		# Pan-STARRS Test Camera III
 	ESOWFI			STR	esowfi/camera.config		# ESO Wide-Field Imager
 	LBCRED                  STR     lbc_red/camera.config           # Large Binocular Camera Red
@@ -18,4 +19,5 @@
 	VYSOS20			STR	vysos20/camera.config		# VYSOS 5in
 	SSP			STR	ssp/camera.config		# Pan-STARRS spectroscopic sky probe
+	SUPRIMECAM		STR	suprime/camera.config           # Subaru Suprimecam
 	SIMMOSAIC		STR	simmosaic/camera.config		# Simulated mosaic, for testing
 	SIMTEST			STR	simtest/camera.config		# Simulation test camera
@@ -26,5 +28,4 @@
 #	UCAM			STR	ucam/camera.config
 #	LRIS_BLUE		STR	lris_blue/camera.config
-#	TC3			STR	tc3/camera.config		# Pan-STARRS Test Camera III
 #	LRIS_RED		STR	lris_red/camera.config
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/Makefile.am
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/Makefile.am	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/Makefile.am	(revision 37065)
@@ -6,4 +6,5 @@
 	camera.config \
 	format.config \
+	format_ps2.config \
 	ppImage.config
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/camera.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/camera.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/camera.config	(revision 37065)
@@ -4,4 +4,5 @@
 FORMATS		METADATA
 	RAW	STR	tc3/format.config
+	PS2	STR	tc3/format_ps2.config
 END
 
@@ -16,4 +17,21 @@
 	CCID45-1-05A 	STR	xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
 	CCID45-1-19A 	STR	xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+
+	XY00            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY01            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY02            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY03            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY10            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY11            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY12            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY13            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY20            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY21            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY22            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY23            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY30            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY31            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY32            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
+	XY33            STR     xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77
 END
 
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/format.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/format.config	(revision 37064)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/format.config	(revision 37065)
@@ -6,4 +6,5 @@
 	ORIGIN		STR	PS1
 	CONTROLR	STR	STARGRASP
+	INSTRUME	STR	tc3
 	EXTEND		BOOL	T
 END
Index: /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/format_ps2.config
===================================================================
--- /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/format_ps2.config	(revision 37065)
+++ /branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/format_ps2.config	(revision 37065)
@@ -0,0 +1,315 @@
+# Camera format configuration for Pan-STARRS Test Camera 3
+
+# How to recognise this type
+RULE	METADATA
+#        IMAGESWV        STR     GPC DaqCom v2.05 (Mar 08 2007)
+	ORIGIN		STR	PS2
+	CONTROLR	STR	STARGRASP
+	INSTRUME	STR	tc3
+	EXTEND		BOOL	T
+END
+
+FILE	METADATA
+	# How to read this data
+	PHU		STR	CHIP	# The FITS file represents a chip
+	EXTENSIONS	STR	CELL	# The extensions represent cells
+	FPA.OBS	STR	OBSTYPE	# A PHU keyword for unique identifier
+	CONTENT	        STR     DETECTOR # How to determine content of FITS file
+	CONTENT.RULE	STR	{CHIP.NAME}	# How to derive the CONTENT when writing
+END
+
+# What's in the FITS file?
+CONTENTS	METADATA
+	# File identifier with corresponding file layout name
+  	CCID58-1-09a2   STR     XY00:CCD_10u
+  	CCID58-1-18a1   STR     XY01:CCD_10u
+  	CCID58-2-18b2   STR     XY02:CCD_10u
+  	CCID58-2-16a2   STR     XY03:CCD_10u
+  	CCID58-2-17a2   STR     XY10:CCD_10u
+  	CCID58-2-16a1   STR     XY11:CCD_10u
+  	CCID58-2-10b2   STR     XY12:CCD_10u
+  	CCID58-1-12a1   STR     XY13:CCD_10u
+  	CCID58-2-07a2   STR     XY20:CCD_10u
+  	CCID58-2-07a1   STR     XY21:CCD_10u
+  	CCID58-1-06b2   STR     XY22:CCD_10u
+  	CCID58-2-14a1   STR     XY23:CCD_10u
+  	CCID58-1-13a1   STR     XY30:CCD_10u
+  	CCID58-3-14a2   STR     XY31:CCD_10u
+  	CCID58-1-04b2   STR     XY32:CCD_10u
+  	CCID58-1-14a2   STR     XY33:CCD_10u
+END
+
+# Specify the layout
+CHIPS	METADATA
+	CCD_10u		METADATA
+		# Extension name, cellName:cellType
+		xy00	STR	xy00:pitch10u
+		xy01	STR	xy01:pitch10u
+		xy02	STR	xy02:pitch10u
+		xy03	STR	xy03:pitch10u
+		xy04	STR	xy04:pitch10u
+		xy05	STR	xy05:pitch10u
+		xy06	STR	xy06:pitch10u
+		xy07	STR	xy07:pitch10u
+		xy10	STR	xy10:pitch10u
+		xy11	STR	xy11:pitch10u
+		xy12	STR	xy12:pitch10u
+		xy13	STR	xy13:pitch10u
+		xy14	STR	xy14:pitch10u
+		xy15	STR	xy15:pitch10u
+		xy16	STR	xy16:pitch10u
+		xy17	STR	xy17:pitch10u
+		xy20	STR	xy20:pitch10u
+		xy21	STR	xy21:pitch10u
+		xy22	STR	xy22:pitch10u
+		xy23	STR	xy23:pitch10u
+		xy24	STR	xy24:pitch10u
+		xy25	STR	xy25:pitch10u
+		xy26	STR	xy26:pitch10u
+		xy27	STR	xy27:pitch10u
+		xy30	STR	xy30:pitch10u
+		xy31	STR	xy31:pitch10u
+		xy32	STR	xy32:pitch10u
+		xy33	STR	xy33:pitch10u
+		xy34	STR	xy34:pitch10u
+		xy35	STR	xy35:pitch10u
+		xy36	STR	xy36:pitch10u
+		xy37	STR	xy37:pitch10u
+		xy40	STR	xy40:pitch10u
+		xy41	STR	xy41:pitch10u
+		xy42	STR	xy42:pitch10u
+		xy43	STR	xy43:pitch10u
+		xy44	STR	xy44:pitch10u
+		xy45	STR	xy45:pitch10u
+		xy46	STR	xy46:pitch10u
+		xy47	STR	xy47:pitch10u
+		xy50	STR	xy50:pitch10u
+		xy51	STR	xy51:pitch10u
+		xy52	STR	xy52:pitch10u
+		xy53	STR	xy53:pitch10u
+		xy54	STR	xy54:pitch10u
+		xy55	STR	xy55:pitch10u
+		xy56	STR	xy56:pitch10u
+		xy57	STR	xy57:pitch10u
+		xy60	STR	xy60:pitch10u
+		xy61	STR	xy61:pitch10u
+		xy62	STR	xy62:pitch10u
+		xy63	STR	xy63:pitch10u
+		xy64	STR	xy64:pitch10u
+		xy65	STR	xy65:pitch10u
+		xy66	STR	xy66:pitch10u
+		xy67	STR	xy67:pitch10u
+		xy70	STR	xy70:pitch10u
+		xy71	STR	xy71:pitch10u
+		xy72	STR	xy72:pitch10u
+		xy73	STR	xy73:pitch10u
+		xy74	STR	xy74:pitch10u
+		xy75	STR	xy75:pitch10u
+		xy76	STR	xy76:pitch10u
+		xy77	STR	xy77:pitch10u
+	END
+END		
+
+# Specify the cell data
+CELLS	METADATA
+	pitch10u	METADATA
+		CELL.BIASSEC.SOURCE	STR	HEADER
+		CELL.TRIMSEC.SOURCE	STR	HEADER
+		CELL.BIASSEC		STR	BIASSEC
+		CELL.TRIMSEC		STR	DATASEC
+	END
+END
+
+# How to translate PS concepts into FITS headers
+TRANSLATION	METADATA
+        FPA.FILTERID    STR     FILTERID
+        FPA.FILTER      STR     FILTERID
+        FPA.RA          STR     RA
+        FPA.DEC         STR     DEC
+        FPA.RADECSYS    STR     EQUINOX
+        FPA.OBSTYPE     STR     OBSTYPE
+        FPA.OBJECT      STR     OBJECT
+        FPA.OBS.MODE    STR     OBS_MODE
+        FPA.COMMENT     STR     CMMTOBS
+        FPA.AIRMASS     STR     AIRMASS
+        FPA.POSANGLE    STR     POSANGLE
+	FPA.ROTANGLE	STR	ROT
+        FPA.FOCUS       STR     M2Z
+        FPA.TIME        STR     SHUTOUTC
+        FPA.EXPOSURE    STR     EXPREQ          # Requested exposure time, presumably camera exposure time
+        FPA.ALT         STR     ALT
+        FPA.AZ          STR     AZ
+        FPA.TEMP        STR     DETTEM
+        FPA.M1X         STR     M1X
+        FPA.M1Y         STR     M1Y   
+        FPA.M1Z         STR     M1Z   
+        FPA.M1TIP       STR     M1TIP 
+        FPA.M1TILT      STR     M1TILT
+        FPA.M2X         STR     M2X
+        FPA.M2Y         STR     M2Y   
+        FPA.M2Z         STR     M2Z   
+        FPA.M2TIP       STR     M2TIP 
+        FPA.M2TILT      STR     M2TILT
+        FPA.ENV.TEMP    STR     ENVTEM
+        FPA.ENV.HUMID   STR     ENVHUM
+        FPA.ENV.WIND    STR     ENVWIN
+        FPA.ENV.DIR     STR     ENVDIR
+        FPA.PON.TIME    STR     PONTIME
+#	FPA.TELESCOPE	STR	TELESCOP -- hardwired for format
+#	FPA.INSTRUMENT	STR	INSTRUME -- hardwired for format
+#	FPA.DETECTOR	STR	DETECTOR -- hardwired for format
+
+        FPA.TELTEMP.M1       STR  TELTEMM1 # Primary mirror temps (C) 
+        FPA.TELTEMP.M1CELL   STR  TELTEMMS # Primary mirror support temps (C)   
+        FPA.TELTEMP.M2       STR  TELTEMM2 # Secondary mirror temps (C
+        FPA.TELTEMP.SPIDER   STR  TELTEMSP # Spider temperatures (C)  
+        FPA.TELTEMP.TRUSS    STR  TELTEMTR # Mid truss temperatures (C
+        FPA.TELTEMP.EXTRA    STR  TELTEMEX # Miscellaneous temperatures (C)     
+
+        FPA.BURNTOOL.APPLIED STR BTOOLAPP
+
+        CHIP.ID         STR     DETECTOR
+        CELL.XBIN       STR     CCDSUM
+        CELL.YBIN       STR     CCDSUM
+        CELL.X0         STR     IMNPIX1
+        CELL.Y0         STR     IMNPIX2
+        CELL.XPARITY    STR     ATM1_1
+        CELL.YPARITY    STR     ATM2_2
+	CHIP.TEMP	STR	CDETTEM
+	CHIP.TEMPERATURE STR	DETTEM
+	CHIP.VIDEOCELL  STR     CELLMODE
+
+        CELL.EXPOSURE   STR     EXPTIME         # Exposure time measured by shutter
+        CELL.DARKTIME   STR     DARKTIME        # Exposure time for camera
+        CELL.TIME       STR     SHUTOUTC	# Observation time
+        # XXX CELL.GAIN       STR     GAIN		# Cell gain (e/ADU)
+        CELL.READNOISE  STR     RDNOISE		# Cell read noise (ADU)
+        # XXX CELL.SATURATION STR     MAXLIN		# Saturation point (ADU)
+
+END
+
+# Default PS concepts that may be specified by value
+DEFAULTS        METADATA
+        FPA.TELESCOPE   STR     PS2
+        FPA.INSTRUMENT  STR     TC3
+        FPA.LONGITUDE   STR     10:25:01.417 # West Longitude in Hours 10.4170608521 XXX need to fix...
+        FPA.LATITUDE    STR     20:42:25.558 # North Latitude in Degrees 20.7070999146 XXX need to fix...
+        FPA.ELEVATION   F32     3048.0 # altitude in meters XXX need to fix...
+        FPA.DETECTOR    STR     TC3
+        FPA.TIMESYS     STR     UTC
+
+	CHIP.XSIZE	S32	4846
+	CHIP.YSIZE	S32	4868
+        CHIP.XPARITY    S32     1
+        CHIP.YPARITY    S32     1
+
+	CELL.TIMESYS	STR	UTC
+	CELL.READDIR	S32	1		# Cell is read in x direction
+        CELL.BAD        S32     0
+
+	# XXX these should come from the header, but not for now
+        CELL.GAIN       F32     1.0		# Cell gain (e/ADU)
+        CELL.SATURATION F32     40000		# Saturation point (ADU)
+
+	### How to get FPA coordinates from chip coordinates
+        CHIP.X0.DEPEND          STR     CHIP.NAME
+        CHIP.X0         METADATA
+          XY00  S32     4971
+          XY01  S32     4971
+          XY02  S32     4971
+          XY03  S32     4971
+          XY10  S32     9942
+          XY11  S32     9942
+          XY12  S32     9942
+          XY13  S32     9942
+          XY20  S32     14913
+          XY21  S32     14913
+          XY22  S32     14913
+          XY23  S32     14913
+          XY30  S32     19884
+          XY31  S32     19884
+          XY32  S32     19884
+          XY33  S32     19884
+        END
+        CHIP.Y0.DEPEND          STR     CHIP.NAME
+        CHIP.Y0         METADATA
+          XY00  S32      5143
+          XY01  S32     10286
+          XY02  S32     15429
+          XY03  S32     20572
+          XY10  S32      5143
+          XY11  S32     10286
+          XY12  S32     15429
+          XY13  S32     20572
+          XY20  S32      5143
+          XY21  S32     10286
+          XY22  S32     15429
+          XY23  S32     20572
+          XY30  S32      5143
+          XY31  S32     10286
+          XY32  S32     15429
+          XY33  S32     20572
+        END
+        CHIP.XPARITY.DEPEND     STR     CHIP.NAME
+        CHIP.XPARITY    METADATA
+          XY00  S32     -1
+          XY01  S32     -1
+          XY02  S32     -1
+          XY03  S32     -1
+          XY10  S32     -1
+          XY11  S32     -1
+          XY12  S32     -1
+          XY13  S32     -1
+          XY20  S32     -1
+          XY21  S32     -1
+          XY22  S32     -1
+          XY23  S32     -1
+          XY30  S32     -1
+          XY31  S32     -1
+          XY32  S32     -1
+          XY33  S32     -1
+        END
+        CHIP.YPARITY.DEPEND     STR     CHIP.NAME
+        CHIP.YPARITY    METADATA
+          XY00  S32     -1
+          XY01  S32     -1
+          XY02  S32     -1
+          XY03  S32     -1
+          XY10  S32     -1
+          XY11  S32     -1
+          XY12  S32     -1
+          XY13  S32     -1
+          XY20  S32     -1
+          XY21  S32     -1
+          XY22  S32     -1
+          XY23  S32     -1
+          XY30  S32     -1
+          XY31  S32     -1
+          XY32  S32     -1
+          XY33  S32     -1
+        END
+END
+
+# How to translation PS concepts into database lookups
+DATABASE	METADATA
+	TYPE		dbEntry		TABLE		COLUMN		GIVENDBCOL	GIVENPS
+#	CELL.GAIN	dbEntry		Camera		gain		chipId,cellId	CHIP.NAME,CELL.NAME
+#	CELL.READNOISE	dbEntry		Camera		readNoise	chipId,cellId	CHIP.NAME,CELL.NAME
+
+# A database entry refers to a particular column (COLUMN) in a
+# particular table (TABLE), given certain PS concepts (GIVENPS) that
+# match certain database columns (GIVENDBCOL).
+END		
+
+# Where there might be some ambiguity, specify the format
+FORMATS		METADATA
+	FPA.RA		STR	HOURS
+	FPA.DEC		STR	DEGREES
+	FPA.LONGITUDE	STR	HOURS
+	FPA.LATITUDE	STR	DEGREES
+	FPA.TIME	STR	MJD
+	CELL.TIME	STR	MJD
+        CELL.BINNING    STR     TOGETHER
+	CELL.READNOISE	STR	ADU
+END
+ 
