Changeset 37065

Timestamp:

Jul 17, 2014, 12:29:35 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ippconfig

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• dvo.photcodes (modified) (1 diff)
• gpc1/camera.config (modified) (1 diff)
• gpc1/dvo.config (modified) (1 diff)
• gpc1/format_orig.config (modified) (1 diff)
• gpc1/ppImage.config (modified) (1 diff, 1 prop)
• gpc1/ppStack.config (modified) (5 diffs, 1 prop)
• gpc1/psastro.config (modified) (11 diffs, 1 prop)
• gpc1/psphot.config (modified) (2 diffs, 1 prop)
• recipes/filerules-mef.mdc (modified) (6 diffs)
• recipes/filerules-simple.mdc (modified) (6 diffs)
• recipes/filerules-split.mdc (modified) (4 diffs, 1 prop)
• recipes/nightly_science.config (modified) (1 prop)
• recipes/ppImage.config (modified) (1 prop)
• recipes/ppSim.config (modified) (1 diff)
• recipes/ppStack.config (modified) (4 diffs, 1 prop)
• recipes/ppStats.config (modified) (1 diff)
• recipes/ppStatsFromMetadata.config (modified) (1 diff)
• recipes/ppSub.config (modified) (1 prop)
• recipes/psastro.config (modified) (3 diffs, 1 prop)
• recipes/psphot.config (modified) (20 diffs, 1 prop)
• recipes/reductionClasses.mdc (modified) (2 diffs, 1 prop)
• simple/camera.config (modified) (1 diff)
• simtest/format.config (modified) (1 diff)
• suprime (copied) (copied from trunk/ippconfig/suprime )
• suprime/Makefile.am (copied) (copied from trunk/ippconfig/suprime/Makefile.am )
• suprime/camera.config (copied) (copied from trunk/ippconfig/suprime/camera.config )
• suprime/dvo.config (copied) (copied from trunk/ippconfig/suprime/dvo.config )
• suprime/dvo.layout (copied) (copied from trunk/ippconfig/suprime/dvo.layout )
• suprime/format_mef.config (copied) (copied from trunk/ippconfig/suprime/format_mef.config )
• suprime/format_raw.config (copied) (copied from trunk/ippconfig/suprime/format_raw.config )
• suprime/format_split.config (copied) (copied from trunk/ippconfig/suprime/format_split.config )
• suprime/ppImage.config (copied) (copied from trunk/ippconfig/suprime/ppImage.config )
• suprime/ppMerge.config (copied) (copied from trunk/ippconfig/suprime/ppMerge.config )
• suprime/ppStack.config (copied) (copied from trunk/ippconfig/suprime/ppStack.config )
• suprime/psastro.config (copied) (copied from trunk/ippconfig/suprime/psastro.config )
• suprime/psphot.config (copied) (copied from trunk/ippconfig/suprime/psphot.config )
• suprime/pswarp.config (copied) (copied from trunk/ippconfig/suprime/pswarp.config )
• suprime/rejections.config (copied) (copied from trunk/ippconfig/suprime/rejections.config )
• system.config (modified) (3 diffs)
• tc3/Makefile.am (modified) (1 diff)
• tc3/camera.config (modified) (2 diffs)
• tc3/format.config (modified) (1 diff)
• tc3/format_ps2.config (copied) (copied from trunk/ippconfig/tc3/format_ps2.config )

branches/eam_branches/ipp-ops-20130712/ippconfig/Makefile.am

@@ -20 +20 @@
         lulin \
         ssp \
-        uh8k
+        uh8k \
+        suprime 
 
 install_files = \

branches/eam_branches/ipp-ops-20130712/ippconfig/configure.ac

@@ -32 +32 @@
   ssp/Makefile
   uh8k/Makefile
+  suprime/Makefile
 ])
 AC_OUTPUT

branches/eam_branches/ipp-ops-20130712/ippconfig/dvo.photcodes

@@ -903 +903 @@
   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

branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/camera.config

@@ -139 +139 @@
   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
 

branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/dvo.config

@@ -71 +71 @@
 POS_TOOFEW              1
 RELASTRO_SIGMA_LIM      0.01  # select measurements with dM < SIGMA_LIM for relphot analysis
+PAR_FACTOR_MIN          0.2

branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/format_orig.config

@@ -8 +8 @@
         CONTROLR        STR     STARGRASP
         NAMPS           S32     64
+        MJD-OBS         F64     54734.0  # OP: <
 END
 

branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppImage.config

@@ -26 +26 @@
 
 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 

branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/ppStack.config

@@ -79 +79 @@
    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 +160 @@
     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 +168 @@
     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 +194 @@
     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 +220 @@
     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
 

branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psastro.config

@@ -66 +66 @@
 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 +87 @@
 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 +122 @@
 # 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 +363 @@
 
 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 +376 @@
 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 +408 @@
    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 +428 @@
     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 +448 @@
 # - 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 +485 @@
 # 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 +494 @@
    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 +505 @@
    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
   

branches/eam_branches/ipp-ops-20130712/ippconfig/gpc1/psphot.config

@@ -28 +28 @@
 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 +55 @@
   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

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-mef.mdc

@@ -86 +86 @@
 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 +111 @@
 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 +183 @@
 PPBACKGROUND.PATTERN      INPUT    @FILES        CHIP       PATTERN
 PPBACKGROUND.BACKGROUND   INPUT    @FILES        CHIP       IMAGE
+PPBACKGROUND.STACK        INPUT    @FILES        FPA        IMAGE
 
 ### output file definitions
@@ -247 +250 @@
 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 +394 @@
 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 +416 @@
 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

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-simple.mdc

@@ -57 +57 @@
 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 +81 @@
 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 +155 @@
 PPBACKGROUND.PATTERN      INPUT    @FILES        CHIP       PATTERN
 PPBACKGROUND.BACKGROUND   INPUT    @FILES        CHIP       IMAGE
+PPBACKGROUND.STACK        INPUT    @FILES        FPA        IMAGE
 
 ### output file definitions
@@ -209 +212 @@
 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 +351 @@
 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 +373 @@
 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

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/filerules-split.mdc

@@ -101 +101 @@
 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 +178 @@
 PPBACKGROUND.PATTERN      INPUT    @FILES        CHIP       PATTERN
 PPBACKGROUND.BACKGROUND   INPUT    @FILES        CHIP       IMAGE
+PPBACKGROUND.STACK        INPUT    @FILES        FPA        IMAGE
 
 ### output file definitions
@@ -399 +401 @@
 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 +435 @@
 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
 
 

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppSim.config

@@ -61 +61 @@
 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

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStack.config

@@ -13 +13 @@
 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 +33 @@
 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 +169 @@
 STACK_THREEPI_ALT  METADATA
 END
+STACK_CNP  METADATA
+END
 
 STACK_MD_REF    METADATA
@@ -187 +192 @@
 STACK_NIGHTLY_1DG  METADATA
     STACK.TYPE      STR     NIGHTLY_STACK
+END
+
+STACK_MDTHREEPI_DEEP_1DG   METADATA
 END
 

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStats.config

@@ -116 +116 @@
   HEADER        STR     DT_ASTR  # elapsed time in astrometry processing
   HEADER        STR     NASTRO
+  HEADER        STR     ASTROM_CHIPS
 
   HEADER        STR     ZPT_OBS

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/ppStatsFromMetadata.config

@@ -274 +274 @@
   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

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psastro.config

@@ -3 +3 @@
 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 +230 @@
 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 +284 @@
 
 STATICSKY_CAL   METADATA
+    PSASTRO.SAVE.CFF           BOOL TRUE  # save a cff file (input for psphotFullForce)
 END
 

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/psphot.config

@@ -1 @@
-
 # these options turn on different inputs and/or outputs
 SAVE.OUTPUT                         BOOL  TRUE
@@ -16 +15 @@
 
 # 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 +40 @@
 
 # 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 +180 @@
 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 +189 @@
 
 # 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 +234 @@
 # 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 +252 @@
  #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 +288 @@
 # 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 +319 @@
 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 +434 @@
 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 +451 @@
 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 +494 @@
   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 +502 @@
   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 +517 @@
 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 +526 @@
   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 +536 @@
 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 +560 @@
 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 +569 @@
   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 +685 @@
   # 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 +723 @@
   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

branches/eam_branches/ipp-ops-20130712/ippconfig/recipes/reductionClasses.mdc

@@ -615 +615 @@
 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 +669 @@
       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
 

branches/eam_branches/ipp-ops-20130712/ippconfig/simple/camera.config

@@ -61 +61 @@
   CMF.XFIT STR xfit
   CMF.DETEFF STR deteff
+  CMF.XGAL STR xgal
 
   PSF.HEAD  STR hdr

branches/eam_branches/ipp-ops-20130712/ippconfig/simtest/format.config

@@ -60 +60 @@
         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

branches/eam_branches/ipp-ops-20130712/ippconfig/system.config

@@ -11 +11 @@
         GPC1                    STR     gpc1/camera.config              # Pan-STARRS GPC1
         GPC1-TDI                STR     gpc1-tdi/camera.config          # Pan-STARRS GPC1 with TDI guiding
+        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 +19 @@
         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 +28 @@
 #       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
 

branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/Makefile.am

@@ -6 +6 @@
         camera.config \
         format.config \
+        format_ps2.config \
         ppImage.config
 

branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/camera.config

@@ -4 +4 @@
 FORMATS         METADATA
         RAW     STR     tc3/format.config
+        PS2     STR     tc3/format_ps2.config
 END
 
@@ -16 +17 @@
         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
 

branches/eam_branches/ipp-ops-20130712/ippconfig/tc3/format.config

@@ -6 +6 @@
         ORIGIN          STR     PS1
         CONTROLR        STR     STARGRASP
+        INSTRUME        STR     tc3
         EXTEND          BOOL    T
 END