Index: branches/czw_branch/20100427/ippconfig/recipes/filerules-mef.mdc
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/filerules-mef.mdc	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/filerules-mef.mdc	(revision 28017)
@@ -134,4 +134,7 @@
 PPSIM.INPUT             INPUT    @FILES        FPA        IMAGE     
 PPSIM.REAL.SOURCES      INPUT    @FILES        CHIP       CMF       
+
+PPCOORD.ASTROM		INPUT	 @FILES	       FPA	  WCS
+PPCOORD.RAW		INPUT	 @FILES	       CHIP	  IMAGE
 
 ## files used by ppNoiseMap
Index: branches/czw_branch/20100427/ippconfig/recipes/filerules-simple.mdc
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/filerules-simple.mdc	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/filerules-simple.mdc	(revision 28017)
@@ -1,5 +1,4 @@
 ### File rules for PHU=FPA, EXT=NONE
 ### The default type of NONE means no compression
-
 
 PSASTRO.INPUT      STR PSASTRO.INPUT.CMF
@@ -15,260 +14,281 @@
 
 ## files used by ppImage
-PPIMAGE.INPUT           INPUT    @FILES        FPA        IMAGE     
-PPIMAGE.INPUT.MASK      INPUT    @FILES        FPA        MASK      
-PPIMAGE.INPUT.VARIANCE  INPUT    @FILES        FPA        VARIANCE  
-PPIMAGE.INPUT.PSF       INPUT    @FILES        READOUT    PSF       
-PPIMAGE.INPUT.SRC       INPUT    @FILES        READOUT    CMF       
-PPIMAGE.MASK            INPUT    @DETDB        CHIP       MASK
-PPIMAGE.BIAS            INPUT    @DETDB        CHIP       IMAGE     
-PPIMAGE.DARK            INPUT    @DETDB        CHIP       DARK     
-PPIMAGE.FLAT            INPUT    @DETDB        CHIP       IMAGE     
-PPIMAGE.FRINGE          INPUT    @DETDB        CHIP       FRINGE
-PPIMAGE.SHUTTER         INPUT    @DETDB        CHIP       IMAGE     
-
-## Files used by ppMerge
-PPMERGE.INPUT           INPUT    @FILES        CHIP       IMAGE
-PPMERGE.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-PPMERGE.INPUT.VARIANCE  INPUT    @FILES        CHIP       VARIANCE
+PPIMAGE.INPUT             INPUT    @FILES        FPA        IMAGE     
+PPIMAGE.INPUT.MASK        INPUT    @FILES        FPA        MASK      
+PPIMAGE.INPUT.VARIANCE    INPUT    @FILES        FPA        VARIANCE  
+PPIMAGE.INPUT.PSF         INPUT    @FILES        READOUT    PSF       
+PPIMAGE.INPUT.SRC         INPUT    @FILES        READOUT    CMF       
+PPIMAGE.MASK              INPUT    @DETDB        CHIP       MASK
+PPIMAGE.BIAS              INPUT    @DETDB        CHIP       IMAGE     
+PPIMAGE.DARK              INPUT    @DETDB        CHIP       DARK     
+PPIMAGE.FLAT              INPUT    @DETDB        CHIP       IMAGE     
+PPIMAGE.FRINGE            INPUT    @DETDB        CHIP       FRINGE
+PPIMAGE.SHUTTER           INPUT    @DETDB        CHIP       IMAGE     
+                          
+## Files used by ppMerge  
+PPMERGE.INPUT             INPUT    @FILES        CHIP       IMAGE
+PPMERGE.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PPMERGE.INPUT.VARIANCE    INPUT    @FILES        CHIP       VARIANCE
 
 ## files used to build and apply the flat-field correction images
-DVOCORR.INPUT           INPUT    @FILES        CHIP       IMAGE
-DVOCORR.REFHEAD         INPUT    @FILES        CHIP       HEADER
-DVOFLAT.INPUT           INPUT    @FILES        CHIP       IMAGE
-DVOFLAT.CORR            INPUT    @DETDB        CHIP       IMAGE
-
-## files used by psphot 
-PSPHOT.LOAD             INPUT    @FILES        CHIP       IMAGE
-PSPHOT.INPUT            INPUT    @FILES        CHIP       IMAGE     
-PSPHOT.MASK             INPUT    @FILES        CHIP       MASK     
-PSPHOT.VARIANCE         INPUT    @FILES        CHIP       VARIANCE   
-PSPHOT.PSF.LOAD         INPUT    @FILES        CHIP       PSF       
-PSPHOT.INPUT.CMF        INPUT    @FILES        CHIP       CMF       
-PSPHOT.INPUT.TEXT       INPUT    @FILES        CHIP       SRCTEXT       
+DVOCORR.INPUT             INPUT    @FILES        CHIP       IMAGE
+DVOCORR.REFHEAD           INPUT    @FILES        CHIP       HEADER
+DVOFLAT.INPUT             INPUT    @FILES        CHIP       IMAGE
+DVOFLAT.CORR              INPUT    @DETDB        CHIP       IMAGE
+                          
+## files used by psphot   
+PSPHOT.LOAD               INPUT    @FILES        CHIP       IMAGE
+PSPHOT.INPUT              INPUT    @FILES        CHIP       IMAGE     
+PSPHOT.MASK               INPUT    @FILES        CHIP       MASK     
+PSPHOT.VARIANCE           INPUT    @FILES        CHIP       VARIANCE   
+PSPHOT.PSF.LOAD           INPUT    @FILES        CHIP       PSF       
+PSPHOT.INPUT.CMF          INPUT    @FILES        CHIP       CMF       
+PSPHOT.INPUT.TEXT         INPUT    @FILES        CHIP       SRCTEXT       
+
+## files used by psphotStack
+PSPHOT.STACK.INPUT.RAW    INPUT    @FILES        CHIP       IMAGE
+PSPHOT.STACK.MASK.RAW     INPUT    @FILES        CHIP       MASK     
+PSPHOT.STACK.VARIANCE.RAW INPUT    @FILES        CHIP       VARIANCE     
+PSPHOT.STACK.PSF.RAW      INPUT    @FILES        CHIP       PSF       
+PSPHOT.STACK.INPUT.CNV    INPUT    @FILES        CHIP       IMAGE
+PSPHOT.STACK.MASK.CNV     INPUT    @FILES        CHIP       MASK     
+PSPHOT.STACK.VARIANCE.CNV INPUT    @FILES        CHIP       VARIANCE     
+PSPHOT.STACK.PSF.CNV      INPUT    @FILES        CHIP       PSF       
+PSPHOT.STACK.SOURCES      INPUT    @FILES        FPA        CMF
 
 ## files used by psastro 
-PSASTRO.INPUT.CMP       INPUT    @FILES        CHIP       CMP       
-PSASTRO.INPUT.CMF       INPUT    @FILES        CHIP       CMF       
-PSASTRO.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-PSASTRO.REFMASK         INPUT    @DETDB        CHIP       MASK
-PSASTRO.WCS             INPUT    @FILES        CHIP       CMF
-PSASTRO.MODEL           INPUT    @DETDB        FPA        ASTROM
-
-PSASTRO.EXTRACT.ASTROM  INPUT    @FILES        CHIP       CMF
-PSASTRO.EXTRACT.INPUT   INPUT    @FILES        CHIP       IMAGE
+PSASTRO.INPUT.CMP         INPUT    @FILES        CHIP       CMP       
+PSASTRO.INPUT.CMF         INPUT    @FILES        CHIP       CMF       
+PSASTRO.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PSASTRO.REFMASK           INPUT    @DETDB        CHIP       MASK
+PSASTRO.WCS               INPUT    @FILES        CHIP       CMF
+PSASTRO.MODEL             INPUT    @DETDB        FPA        ASTROM
+
+PSASTRO.EXTRACT.ASTROM    INPUT    @FILES        CHIP       CMF
+PSASTRO.EXTRACT.INPUT     INPUT    @FILES        CHIP       IMAGE
 
 ## files used by pswarp
-PSWARP.INPUT            INPUT    @FILES        FPA        IMAGE     
-PSWARP.VARIANCE         INPUT    @FILES        FPA        VARIANCE
-PSWARP.MASK             INPUT    @FILES        FPA        MASK
-PSWARP.SKYCELL          INPUT    @FILES        FPA        IMAGE     
-PSWARP.ASTROM           INPUT    @FILES        FPA        CMF
+PSWARP.INPUT              INPUT    @FILES        FPA        IMAGE     
+PSWARP.VARIANCE           INPUT    @FILES        FPA        VARIANCE
+PSWARP.MASK               INPUT    @FILES        FPA        MASK
+PSWARP.SKYCELL            INPUT    @FILES        FPA        IMAGE     
+PSWARP.ASTROM             INPUT    @FILES        FPA        CMF
 
 ## files used by ppsub
-PPSUB.INPUT             INPUT    @FILES        FPA        IMAGE
-PPSUB.INPUT.MASK        INPUT    @FILES        FPA        MASK
-PPSUB.INPUT.VARIANCE    INPUT    @FILES        FPA        VARIANCE
-PPSUB.INPUT.SOURCES     INPUT    @FILES        FPA        CMF
-PPSUB.REF               INPUT    @FILES        FPA        IMAGE
-PPSUB.REF.MASK          INPUT    @FILES        FPA        MASK
-PPSUB.REF.VARIANCE      INPUT    @FILES        FPA        VARIANCE
-PPSUB.REF.SOURCES       INPUT    @FILES        FPA        CMF
-PPSUB.INPUT.KERNEL      INPUT    @FILES        FPA        SUBKERNEL
+PPSUB.INPUT               INPUT    @FILES        FPA        IMAGE
+PPSUB.INPUT.MASK          INPUT    @FILES        FPA        MASK
+PPSUB.INPUT.VARIANCE      INPUT    @FILES        FPA        VARIANCE
+PPSUB.INPUT.SOURCES       INPUT    @FILES        FPA        CMF
+PPSUB.INPUT.KERNEL        INPUT    @FILES        FPA        SUBKERNEL
+PPSUB.REF                 INPUT    @FILES        FPA        IMAGE
+PPSUB.REF.MASK            INPUT    @FILES        FPA        MASK
+PPSUB.REF.VARIANCE        INPUT    @FILES        FPA        VARIANCE
+PPSUB.REF.SOURCES         INPUT    @FILES        FPA        CMF
 
 ## files used by ppstack
-PPSTACK.INPUT           INPUT    @FILES        FPA        IMAGE
-PPSTACK.INPUT.MASK      INPUT    @FILES        FPA        MASK
-PPSTACK.INPUT.VARIANCE  INPUT    @FILES        FPA        VARIANCE
-PPSTACK.INPUT.PSF       INPUT    @FILES        CHIP       PSF
-PPSTACK.INPUT.SOURCES   INPUT    @FILES        FPA        CMF
+PPSTACK.INPUT             INPUT    @FILES        FPA        IMAGE
+PPSTACK.INPUT.MASK        INPUT    @FILES        FPA        MASK
+PPSTACK.INPUT.VARIANCE    INPUT    @FILES        FPA        VARIANCE
+PPSTACK.INPUT.PSF         INPUT    @FILES        CHIP       PSF
+PPSTACK.INPUT.SOURCES     INPUT    @FILES        FPA        CMF
 
 ## files used by ppstamp
-PPSTAMP.INPUT           INPUT    @FILES        FPA        IMAGE
-PPSTAMP.INPUT.MASK      INPUT    @FILES        FPA        MASK
-PPSTAMP.INPUT.VARIANCE  INPUT    @FILES        FPA        VARIANCE
+PPSTAMP.INPUT             INPUT    @FILES        FPA        IMAGE
+PPSTAMP.INPUT.MASK        INPUT    @FILES        FPA        MASK
+PPSTAMP.INPUT.VARIANCE    INPUT    @FILES        FPA        VARIANCE
 
 # files used by pparith
-PPARITH.INPUT.IMAGE     INPUT    @FILES        CHIP       IMAGE
-PPARITH.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-
-PPSKYCELL.IMAGE      	INPUT 	 @FILES        CHIP       IMAGE
-PPSKYCELL.MASK      	INPUT 	 @FILES        CHIP       MASK
-
-PPSIM.INPUT             INPUT    @FILES        FPA        IMAGE     
-PPSIM.REAL.SOURCES      INPUT    @FILES        CHIP       CMF       
+PPARITH.INPUT.IMAGE       INPUT    @FILES        CHIP       IMAGE
+PPARITH.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+
+PPSKYCELL.IMAGE           INPUT    @FILES        CHIP       IMAGE
+PPSKYCELL.MASK            INPUT    @FILES        CHIP       MASK
+
+PPSIM.INPUT               INPUT    @FILES        FPA        IMAGE     
+PPSIM.REAL.SOURCES        INPUT    @FILES        CHIP       CMF       
+
+PPCOORD.ASTROM		  INPUT	   @FILES	 FPA	    WCS
+PPCOORD.RAW		  INPUT	   @FILES	 CHIP	    IMAGE
 
 ## files used by ppNoiseMap
-PPNOISEMAP.INPUT        INPUT    @FILES        CHIP       IMAGE
+PPNOISEMAP.INPUT          INPUT    @FILES        CHIP       IMAGE
 
 ## files used by censorObject 
-CENSOR.INPUT       	INPUT    @FILES        CHIP       CMF
-CENSOR.INPUT.MASK       INPUT    @FILES        CHIP       MASK
+CENSOR.INPUT              INPUT    @FILES        CHIP       CMF
+CENSOR.INPUT.MASK         INPUT    @FILES        CHIP       MASK
 
 ## Files used by ppSmooth
-PPSMOOTH.INPUT          INPUT    @FILES        CHIP       IMAGE
-PPSMOOTH.INPUT.MASK     INPUT    @FILES        CHIP       MASK
-PPSMOOTH.INPUT.VARIANCE INPUT    @FILES        CHIP       VARIANCE
+PPSMOOTH.INPUT            INPUT    @FILES        CHIP       IMAGE
+PPSMOOTH.INPUT.MASK       INPUT    @FILES        CHIP       MASK
+PPSMOOTH.INPUT.VARIANCE   INPUT    @FILES        CHIP       VARIANCE
 
 ## Files used by ppbgrestore
-PPBGRESTORE.INPUT       INPUT    @FILES        FPA        IMAGE
-PPBGRESTORE.BACKMDL     INPUT    @FILES        FPA        IMAGE
+PPBGRESTORE.INPUT         INPUT    @FILES        FPA        IMAGE
+PPBGRESTORE.BACKMDL       INPUT    @FILES        FPA        IMAGE
+
+PPVIZPATTERN.INPUT        INPUT    @FILES        CHIP       PATTERN
 
 ### output file definitions
-TYPE                    OUTPUT FILENAME.RULE         FILE.TYPE FITS.TYPE  DATA.LEVEL FILE.SAVE FILE.FORMAT
-PPIMAGE.OUTPUT          OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPIMAGE.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits      MASK      NONE       FPA        TRUE      SIMPLE
-PPIMAGE.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits      VARIANCE  NONE       FPA        TRUE      SIMPLE
-PPIMAGE.OUTPUT.DETMASK  OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPIMAGE.OUTPUT.DETREND  OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPIMAGE.OUTPUT.RESID    OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPIMAGE.CONFIG          OUTPUT {OUTPUT}.ppImage.mdc  TEXT      NONE       FPA        TRUE      NONE
-                                                     
-PPIMAGE.CHIP            OUTPUT {OUTPUT}.ch.fits      IMAGE     NONE       FPA        TRUE      SIMPLE
-PPIMAGE.CHIP.MASK       OUTPUT {OUTPUT}.ch.mk.fits   MASK      NONE       FPA        TRUE      SIMPLE
-PPIMAGE.CHIP.VARIANCE   OUTPUT {OUTPUT}.ch.wt.fits   VARIANCE  NONE       FPA        TRUE      SIMPLE
-                                                     
-PPIMAGE.OUTPUT.FPA1     OUTPUT {OUTPUT}.b1.fits      IMAGE     NONE       FPA        TRUE      SIMPLE
-PPIMAGE.OUTPUT.FPA2     OUTPUT {OUTPUT}.b2.fits      IMAGE     NONE       FPA        TRUE      SIMPLE
-                                                     
-PPIMAGE.BIN1            OUTPUT {OUTPUT}.b1.fits      IMAGE     NONE       FPA        TRUE      SIMPLE
-PPIMAGE.BIN2            OUTPUT {OUTPUT}.b2.fits      IMAGE     NONE       FPA        TRUE      SIMPLE
-                                                     
-PPIMAGE.JPEG1           OUTPUT {OUTPUT}.b1.jpg       JPEG      NONE       FPA        TRUE      NONE
-PPIMAGE.JPEG2           OUTPUT {OUTPUT}.b2.jpg       JPEG      NONE       FPA        TRUE      NONE
-                                                     
-PPIMAGE.STATS           OUTPUT {OUTPUT}.stats        STATS     NONE       FPA        TRUE      NONE
+TYPE                         OUTPUT FILENAME.RULE                 FILE.TYPE       FITS.TYPE  DATA.LEVEL FILE.SAVE FILE.FORMAT
+PPIMAGE.OUTPUT               OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits              MASK            NONE       FPA        TRUE      SIMPLE
+PPIMAGE.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits              VARIANCE        NONE       FPA        TRUE      SIMPLE
+PPIMAGE.OUTPUT.DETMASK       OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.OUTPUT.DETREND       OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.OUTPUT.RESID         OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.CONFIG               OUTPUT {OUTPUT}.ppImage.mdc          TEXT            NONE       FPA        TRUE      NONE
+                                                     
+PPIMAGE.CHIP                 OUTPUT {OUTPUT}.ch.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.CHIP.DETMASK         OUTPUT {OUTPUT}.ch.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.CHIP.MASK            OUTPUT {OUTPUT}.ch.mk.fits           MASK            NONE       FPA        TRUE      SIMPLE
+PPIMAGE.CHIP.VARIANCE        OUTPUT {OUTPUT}.ch.wt.fits           VARIANCE        NONE       FPA        TRUE      SIMPLE
+PPIMAGE.CHIP.RESID           OUTPUT {OUTPUT}.ch.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+                                                     
+PPIMAGE.OUTPUT.FPA1          OUTPUT {OUTPUT}.b1.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.OUTPUT.FPA2          OUTPUT {OUTPUT}.b2.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+                                                     
+PPIMAGE.BIN1                 OUTPUT {OUTPUT}.b1.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+PPIMAGE.BIN2                 OUTPUT {OUTPUT}.b2.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+                                                     
+PPIMAGE.JPEG1                OUTPUT {OUTPUT}.b1.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPIMAGE.JPEG2                OUTPUT {OUTPUT}.b2.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPIMAGE.PATTERN              OUTPUT {OUTPUT}.ptn                  PATTERN         NONE       FPA        TRUE      NONE
+PPIMAGE.STATS                OUTPUT {OUTPUT}.stats                STATS           NONE       FPA        TRUE      NONE
 
 
 ## note: these use the  same output naming convention since they are used for different ppMerge runs
-PPMERGE.OUTPUT.MASK     OUTPUT {OUTPUT}.fits         MASK      NONE       FPA        TRUE      SIMPLE
-PPMERGE.OUTPUT.BIAS     OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPMERGE.OUTPUT.DARK     OUTPUT {OUTPUT}.fits         DARK      NONE       FPA        TRUE      SIMPLE
-PPMERGE.OUTPUT.SHUTTER  OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPMERGE.OUTPUT.FLAT     OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPMERGE.OUTPUT.FRINGE   OUTPUT {OUTPUT}.fits         FRINGE    NONE       FPA        TRUE      SIMPLE
-PPMERGE.OUTPUT.SIGMA    OUTPUT {OUTPUT}.sigma.fits   IMAGE     NONE       FPA        TRUE      SIMPLE
-PPMERGE.OUTPUT.COUNT    OUTPUT {OUTPUT}.count.fits   IMAGE     NONE       FPA        TRUE      SIMPLE
-                                                     
-DVOCORR.OUTPUT          OUTPUT {OUTPUT}.fc.fits      IMAGE     NONE       FPA        TRUE      SIMPLE
-DVOFLAT.OUTPUT          OUTPUT {OUTPUT}.co.fits      IMAGE     NONE       FPA        TRUE      SIMPLE
-                                                     
-PSPHOT.RESID            OUTPUT {OUTPUT}.res.fits     IMAGE     NONE       FPA        TRUE      SIMPLE
-PSPHOT.BACKGND          OUTPUT {OUTPUT}.bck.fits     IMAGE     NONE       FPA        TRUE      SIMPLE
-PSPHOT.BACKSUB          OUTPUT {OUTPUT}.sub.fits     IMAGE     NONE       FPA        TRUE      SIMPLE
-PSPHOT.BACKMDL          OUTPUT {OUTPUT}.mdl.fits     IMAGE     NONE       FPA        TRUE      SIMPLE
-PSPHOT.BACKMDL.MEF      OUTPUT {OUTPUT}.mdl.fits     IMAGE     NONE       FPA        TRUE      SIMPLE
-                                                     
-PSPHOT.OUTPUT.RAW       OUTPUT {OUTPUT}              RAW       NONE       FPA        TRUE      NONE
-PSPHOT.OUTPUT.SX        OUTPUT {OUTPUT}.sx           SX        NONE       FPA        TRUE      NONE
-PSPHOT.OUTPUT.OBJ       OUTPUT {OUTPUT}.obj          OBJ       NONE       FPA        TRUE      NONE
-PSPHOT.OUTPUT.CMP       OUTPUT {OUTPUT}.cmp          CMP       NONE       FPA        TRUE      NONE
-PSPHOT.OUTPUT.CMF       OUTPUT {OUTPUT}.cmf          CMF       NONE       CHIP       TRUE      NONE
-PSPHOT.OUT.CMF.MEF      OUTPUT {OUTPUT}.cmf          CMF       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
+PPMERGE.OUTPUT.MASK          OUTPUT {OUTPUT}.fits                 MASK            NONE       FPA        TRUE      SIMPLE
+PPMERGE.OUTPUT.BIAS          OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPMERGE.OUTPUT.DARK          OUTPUT {OUTPUT}.fits                 DARK            NONE       FPA        TRUE      SIMPLE
+PPMERGE.OUTPUT.SHUTTER       OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPMERGE.OUTPUT.FLAT          OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPMERGE.OUTPUT.FRINGE        OUTPUT {OUTPUT}.fits                 FRINGE          NONE       FPA        TRUE      SIMPLE
+PPMERGE.OUTPUT.SIGMA         OUTPUT {OUTPUT}.sigma.fits           IMAGE           NONE       FPA        TRUE      SIMPLE
+PPMERGE.OUTPUT.COUNT         OUTPUT {OUTPUT}.count.fits           IMAGE           NONE       FPA        TRUE      SIMPLE
+                                                     
+DVOCORR.OUTPUT               OUTPUT {OUTPUT}.fc.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+DVOFLAT.OUTPUT               OUTPUT {OUTPUT}.co.fits              IMAGE           NONE       FPA        TRUE      SIMPLE
+                                                     
+PSPHOT.RESID                 OUTPUT {OUTPUT}.res.fits             IMAGE           NONE       FPA        TRUE      SIMPLE
+PSPHOT.BACKGND               OUTPUT {OUTPUT}.bck.fits             IMAGE           NONE       FPA        TRUE      SIMPLE
+PSPHOT.BACKSUB               OUTPUT {OUTPUT}.sub.fits             IMAGE           NONE       FPA        TRUE      SIMPLE
+PSPHOT.BACKMDL               OUTPUT {OUTPUT}.mdl.fits             IMAGE           NONE       FPA        TRUE      SIMPLE
+PSPHOT.BACKMDL.MEF           OUTPUT {OUTPUT}.mdl.fits             IMAGE           NONE       FPA        TRUE      SIMPLE
+                                                     
+PSPHOT.OUTPUT.RAW            OUTPUT {OUTPUT}                      RAW             NONE       FPA        TRUE      NONE
+PSPHOT.OUTPUT.SX             OUTPUT {OUTPUT}.sx                   SX              NONE       FPA        TRUE      NONE
+PSPHOT.OUTPUT.OBJ            OUTPUT {OUTPUT}.obj                  OBJ             NONE       FPA        TRUE      NONE
+PSPHOT.OUTPUT.CMP            OUTPUT {OUTPUT}.cmp                  CMP             NONE       FPA        TRUE      NONE
+PSPHOT.OUTPUT.CMF            OUTPUT {OUTPUT}.cmf                  CMF             NONE       CHIP       TRUE      NONE
+PSPHOT.OUT.CMF.MEF           OUTPUT {OUTPUT}.cmf                  CMF             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
 
 # outputs for psphotStack:
-PSPHOT.CHISQ.IMAGE      OUTPUT {OUTPUT}.chisq.im.fits IMAGE    NONE       FPA        TRUE      SIMPLE
-PSPHOT.CHISQ.MASK       OUTPUT {OUTPUT}.chisq.mk.fits MASK     NONE       FPA        TRUE      SIMPLE
-PSPHOT.CHISQ.VARIANCE   OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE       FPA        TRUE      SIMPLE
-PSPHOT.STACK.OUTPUT     OUTPUT {OUTPUT}.{FILE.ID}.cmf CMF      NONE       FPA        TRUE      NONE
-                                                     
-SOURCE.PLOT.MOMENTS     OUTPUT {OUTPUT}.mnt.png      KAPA      NONE       FPA        TRUE      NONE
-SOURCE.PLOT.PSFMODEL    OUTPUT {OUTPUT}.psf.png      KAPA      NONE       FPA        TRUE      NONE
-SOURCE.PLOT.APRESID     OUTPUT {OUTPUT}.dap.png      KAPA      NONE       FPA        TRUE      NONE
-                                                     
-PSASTRO.OUTPUT.CMP      OUTPUT {OUTPUT}.smp          CMP       NONE       FPA        TRUE      NONE
-PSASTRO.OUTPUT.CMF      OUTPUT {OUTPUT}.smf          CMF       NONE       FPA        TRUE      NONE
-PSASTRO.OUT.MODEL       OUTPUT {OUTPUT}.asm          ASTROM.MODEL    NONE FPA        TRUE      NONE
-PSASTRO.OUT.REFSTARS    OUTPUT {OUTPUT}.aref.fits    ASTROM.REFSTARS NONE FPA        TRUE      NONE
-PSASTRO.STATS           OUTPUT {OUTPUT}.stats        STATS     NONE       FPA        TRUE      NONE
-PSASTRO.CONFIG          OUTPUT {OUTPUT}.psastro.mdc  TEXT      NONE       FPA        TRUE      NONE
-PSASTRO.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits      MASK      COMP_MASK  CHIP       TRUE      NONE
-                                                     
-PSWARP.OUTPUT           OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      NONE
-PSWARP.OUTPUT.MASK      OUTPUT {OUTPUT}.mask.fits    MASK      NONE       FPA        TRUE      NONE
-PSWARP.OUTPUT.VARIANCE  OUTPUT {OUTPUT}.wt.fits      VARIANCE  NONE       FPA        TRUE      NONE
-PSWARP.OUTPUT.SOURCES   OUTPUT {OUTPUT}.cmf          CMF       NONE       FPA        TRUE      NONE
-PSWARP.BIN1             OUTPUT {OUTPUT}.b1.fits      IMAGE     NONE       FPA        TRUE      NONE
-PSWARP.BIN2             OUTPUT {OUTPUT}.b2.fits      IMAGE     NONE       FPA        TRUE      NONE
-PSWARP.CONFIG           OUTPUT {OUTPUT}.pswarp.mdc   TEXT      NONE       FPA        TRUE      NONE
-                                                     
-SKYCELL.STATS           OUTPUT {OUTPUT}.stats        STATS     NONE       FPA        TRUE      NONE
-SKYCELL.TEMPLATE        OUTPUT {OUTPUT}.skycell      SKYCELL   NONE       FPA        TRUE      NONE
-                                                     
-PPSUB.OUTPUT            OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.MASK       OUTPUT {OUTPUT}.mask.fits    MASK      NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.VARIANCE   OUTPUT {OUTPUT}.wt.fits      VARIANCE  NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.SOURCES    OUTPUT {OUTPUT}.cmf          CMF       NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.KERNELS    OUTPUT {OUTPUT}.subkernel    SUBKERNEL NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.JPEG1      OUTPUT {OUTPUT}.b1.jpg       JPEG      NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.JPEG2      OUTPUT {OUTPUT}.b2.jpg       JPEG      NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.RESID.JPEG OUTPUT {OUTPUT}.res.jpg      JPEG      NONE       FPA        TRUE      NONE
-PPSUB.INVERSE           OUTPUT {OUTPUT}.inv.fits     IMAGE     NONE       FPA        TRUE      NONE
-PPSUB.INVERSE.MASK      OUTPUT {OUTPUT}.inv.mask.fits MASK     NONE       FPA        TRUE      NONE
-PPSUB.INVERSE.VARIANCE  OUTPUT {OUTPUT}.inv.wt.fits  VARIANCE  NONE       FPA        TRUE      NONE
-PPSUB.INVERSE.SOURCES   OUTPUT {OUTPUT}.inv.cmf      CMF       NONE       FPA        TRUE      NONE
-PPSUB.CONFIG            OUTPUT {OUTPUT}.ppSub.mdc    TEXT      NONE       FPA        TRUE      NONE
-PPSUB.INPUT.CONV        OUTPUT {OUTPUT}.inConv.fits     IMAGE  NONE       FPA        TRUE      NONE
-PPSUB.INPUT.CONV.MASK   OUTPUT {OUTPUT}.inConv.mk.fits  MASK   NONE       FPA        TRUE      NONE
-PPSUB.INPUT.CONV.VARIANCE OUTPUT {OUTPUT}.inConv.wt.fits VARIANCE NONE    FPA        TRUE      NONE
-PPSUB.REF.CONV        	OUTPUT {OUTPUT}.refConv.fits    IMAGE  NONE       FPA        TRUE      NONE
-PPSUB.REF.CONV.MASK   	OUTPUT {OUTPUT}.refConv.mk.fits MASK   NONE       FPA        TRUE      NONE
-PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE NONE     FPA        TRUE      NONE
-					     
-PPSTACK.OUTPUT          OUTPUT {OUTPUT}.fits         IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSTACK.OUTPUT.MASK     OUTPUT {OUTPUT}.mask.fits    MASK      COMP_MASK  FPA        TRUE      NONE
-PPSTACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.weight.fits  VARIANCE  COMP_WT    FPA        TRUE      NONE
-PPSTACK.OUTPUT.EXP	OUTPUT {OUTPUT}.exp.fits     IMAGE     EXP	  FPA	     TRUE      NONE
-PPSTACK.OUTPUT.EXPNUM	OUTPUT {OUTPUT}.num.fits     MASK      EXPNUM	  FPA	     TRUE      NONE
-PPSTACK.OUTPUT.EXPWT	OUTPUT {OUTPUT}.expwt.fits   VARIANCE  EXP	  FPA	     TRUE      NONE
-PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits  IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSTACK.UNCONV.MASK     OUTPUT {OUTPUT}.unconv.mask.fits MASK  COMP_MASK  FPA        TRUE      NONE
-PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits VARIANCE COMP_WT   FPA        TRUE      NONE
-PPSTACK.UNCONV.EXP	OUTPUT {OUTPUT}.unconv.exp.fits IMAGE  EXP	  FPA	     TRUE      NONE
-PPSTACK.UNCONV.EXPNUM	OUTPUT {OUTPUT}.unconv.num.fits MASK   EXPNUM	  FPA	     TRUE      NONE
-PPSTACK.UNCONV.EXPWT	OUTPUT {OUTPUT}.unconv.expwt.fits VARIANCE EXP	  FPA	     TRUE      NONE
-PPSTACK.TARGET.PSF      OUTPUT {OUTPUT}.target.psf   PSF       NONE       CHIP       TRUE      NONE
-PPSTACK.CONV.KERNEL     OUTPUT {OUTPUT}.{FILE.INDEX}.kernel SUBKERNEL NONE FPA       TRUE      NONE
-PPSTACK.OUTPUT.JPEG1    OUTPUT {OUTPUT}.b1.jpg       JPEG      NONE       FPA        TRUE      NONE
-PPSTACK.OUTPUT.JPEG2    OUTPUT {OUTPUT}.b2.jpg       JPEG      NONE       FPA        TRUE      NONE
-PPSTACK.CONFIG          OUTPUT {OUTPUT}.ppStack.mdc  TEXT      NONE       FPA        TRUE      NONE
+PSPHOT.CHISQ.IMAGE           OUTPUT {OUTPUT}.chisq.im.fits        IMAGE           NONE       FPA        TRUE      SIMPLE
+PSPHOT.CHISQ.MASK            OUTPUT {OUTPUT}.chisq.mk.fits        MASK            NONE       FPA        TRUE      SIMPLE
+PSPHOT.CHISQ.VARIANCE        OUTPUT {OUTPUT}.chisq.wt.fits        VARIANCE        NONE       FPA        TRUE      SIMPLE
+PSPHOT.STACK.OUTPUT.IMAGE    OUTPUT {OUTPUT}.{FILE.ID}.im.fits    IMAGE           NONE       FPA        TRUE      SIMPLE
+PSPHOT.STACK.OUTPUT.MASK     OUTPUT {OUTPUT}.{FILE.ID}.mk.fits    MASK            NONE       FPA        TRUE      SIMPLE
+PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{FILE.ID}.wt.fits    VARIANCE        NONE       FPA        TRUE      SIMPLE
+PSPHOT.STACK.OUTPUT          OUTPUT {OUTPUT}.{FILE.ID}.cmf        CMF             NONE       FPA        TRUE      NONE
+                                                     
+SOURCE.PLOT.MOMENTS          OUTPUT {OUTPUT}.mnt.png              KAPA            NONE       FPA        TRUE      NONE
+SOURCE.PLOT.PSFMODEL         OUTPUT {OUTPUT}.psf.png              KAPA            NONE       FPA        TRUE      NONE
+SOURCE.PLOT.APRESID          OUTPUT {OUTPUT}.dap.png              KAPA            NONE       FPA        TRUE      NONE
+                                                     
+PSASTRO.OUTPUT.CMP           OUTPUT {OUTPUT}.smp                  CMP             NONE       FPA        TRUE      NONE
+PSASTRO.OUTPUT.CMF           OUTPUT {OUTPUT}.smf                  CMF             NONE       FPA        TRUE      NONE
+PSASTRO.OUT.MODEL            OUTPUT {OUTPUT}.asm                  ASTROM.MODEL    NONE       FPA        TRUE      NONE
+PSASTRO.OUT.REFSTARS         OUTPUT {OUTPUT}.aref.fits            ASTROM.REFSTARS NONE       FPA        TRUE      NONE
+PSASTRO.STATS                OUTPUT {OUTPUT}.stats                STATS           NONE       FPA        TRUE      NONE
+PSASTRO.CONFIG               OUTPUT {OUTPUT}.psastro.mdc          TEXT            NONE       FPA        TRUE      NONE
+PSASTRO.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits              MASK            COMP_MASK  CHIP       TRUE      NONE
+                                                     
+PSWARP.OUTPUT                OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      NONE
+PSWARP.OUTPUT.MASK           OUTPUT {OUTPUT}.mask.fits            MASK            NONE       FPA        TRUE      NONE
+PSWARP.OUTPUT.VARIANCE       OUTPUT {OUTPUT}.wt.fits              VARIANCE        NONE       FPA        TRUE      NONE
+PSWARP.OUTPUT.SOURCES        OUTPUT {OUTPUT}.cmf                  CMF             NONE       FPA        TRUE      NONE
+PSWARP.BIN1                  OUTPUT {OUTPUT}.b1.fits              IMAGE           NONE       FPA        TRUE      NONE
+PSWARP.BIN2                  OUTPUT {OUTPUT}.b2.fits              IMAGE           NONE       FPA        TRUE      NONE
+PSWARP.CONFIG                OUTPUT {OUTPUT}.pswarp.mdc           TEXT            NONE       FPA        TRUE      NONE
+                                                     
+SKYCELL.STATS                OUTPUT {OUTPUT}.stats                STATS           NONE       FPA        TRUE      NONE
+SKYCELL.TEMPLATE             OUTPUT {OUTPUT}.skycell              SKYCELL         NONE       FPA        TRUE      NONE
+                                                     
+PPSUB.OUTPUT                 OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.MASK            OUTPUT {OUTPUT}.mask.fits            MASK            NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.VARIANCE        OUTPUT {OUTPUT}.wt.fits              VARIANCE        NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.SOURCES         OUTPUT {OUTPUT}.cmf                  CMF             NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.KERNELS         OUTPUT {OUTPUT}.subkernel            SUBKERNEL       NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.JPEG1           OUTPUT {OUTPUT}.b1.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.JPEG2           OUTPUT {OUTPUT}.b2.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.RESID.JPEG      OUTPUT {OUTPUT}.res.jpg              JPEG            NONE       FPA        TRUE      NONE
+PPSUB.INVERSE                OUTPUT {OUTPUT}.inv.fits             IMAGE           NONE       FPA        TRUE      NONE
+PPSUB.INVERSE.MASK           OUTPUT {OUTPUT}.inv.mask.fits        MASK            NONE       FPA        TRUE      NONE
+PPSUB.INVERSE.VARIANCE       OUTPUT {OUTPUT}.inv.wt.fits          VARIANCE        NONE       FPA        TRUE      NONE
+PPSUB.INVERSE.SOURCES        OUTPUT {OUTPUT}.inv.cmf              CMF             NONE       FPA        TRUE      NONE
+PPSUB.CONFIG                 OUTPUT {OUTPUT}.ppSub.mdc            TEXT            NONE       FPA        TRUE      NONE
+PPSUB.INPUT.CONV             OUTPUT {OUTPUT}.inConv.fits          IMAGE           NONE       FPA        TRUE      NONE
+PPSUB.INPUT.CONV.MASK        OUTPUT {OUTPUT}.inConv.mk.fits       MASK            NONE       FPA        TRUE      NONE
+PPSUB.INPUT.CONV.VARIANCE    OUTPUT {OUTPUT}.inConv.wt.fits       VARIANCE        NONE       FPA        TRUE      NONE
+PPSUB.REF.CONV               OUTPUT {OUTPUT}.refConv.fits         IMAGE           NONE       FPA        TRUE      NONE
+PPSUB.REF.CONV.MASK          OUTPUT {OUTPUT}.refConv.mk.fits      MASK            NONE       FPA        TRUE      NONE
+PPSUB.REF.CONV.VARIANCE      OUTPUT {OUTPUT}.refConv.wt.fits      VARIANCE        NONE       FPA        TRUE      NONE
                                              
-PPSTAMP.OUTPUT          OUTPUT {OUTPUT}.fits         IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSTAMP.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits      MASK      COMP_MASK  FPA        TRUE      NONE
-PPSTAMP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits      VARIANCE  COMP_WT    FPA        TRUE      NONE
-PPSTAMP.CHIP            OUTPUT {OUTPUT}.ch.fits      IMAGE     NONE       CHIP       FALSE     NONE
-                                                     
-PPSIM.OUTPUT            OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPSIM.FAKE.CHIP         OUTPUT {OUTPUT}.fake.fits    IMAGE     NONE       FPA        TRUE      SIMPLE
-PPSIM.FORCE.CHIP        OUTPUT {OUTPUT}.force.fits   IMAGE     NONE       FPA        TRUE      SIMPLE
-PPSIM.SOURCES           OUTPUT {OUTPUT}.cmf          CMF       NONE       FPA        TRUE      NONE
-PPSIM.FAKE.SOURCES      OUTPUT {OUTPUT}.fake.cmf     CMF       NONE       FPA        TRUE      NONE
-PPSIM.FORCE.SOURCES     OUTPUT {OUTPUT}.force.cmf    CMF       NONE       FPA        TRUE      NONE
-                                                     
-PPARITH.OUTPUT.IMAGE    OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      SIMPLE
-PPARITH.OUTPUT.MASK     OUTPUT {OUTPUT}.fits         MASK      NONE       FPA        TRUE      SIMPLE
-
-PPSKYCELL.JPEG1    	OUTPUT {OUTPUT}.{FILE.INDEX}.b1.jpeg JPEG NONE    CHIP       TRUE      NONE
-PPSKYCELL.JPEG2    	OUTPUT {OUTPUT}.{FILE.INDEX}.b2.jpeg JPEG NONE    CHIP       TRUE      NONE
-
-LOG.IMFILE              OUTPUT {OUTPUT}.imfile.log   TEXT      NONE       FPA        TRUE      NONE
-LOG.EXP                 OUTPUT {OUTPUT}.exp.log      TEXT      NONE       FPA        TRUE      NONE
-
-TRACE.IMFILE            OUTPUT {OUTPUT}.imfile.trace TEXT      NONE       FPA        TRUE      NONE
-TRACE.EXP               OUTPUT {OUTPUT}.exp.trace    TEXT      NONE       FPA        TRUE      NONE
-
-PPNOISEMAP.OUTPUT       OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE NONE       CHIP       TRUE      NONE
-
-CENSOR.OUTPUT           OUTPUT {OUTPUT}.smf          CMF       NONE       FPA        TRUE      MEF
-
-MAGIC.ORIGINAL.PNG      OUTPUT {OUTPUT}_original.png             JPEG      NONE       FPA        TRUE      NONE
-MAGIC.RESIDUAL.PNG      OUTPUT {OUTPUT}_residual.png             JPEG      NONE       FPA        TRUE      NONE
-MAGIC.MASK.PNG          OUTPUT {OUTPUT}_mask.png                 JPEG      NONE       FPA        TRUE      NONE
-MAGIC.DUPLICATE.PNG     OUTPUT {OUTPUT}_duplicate.png            JPEG      NONE       FPA        TRUE      NONE
-
-PPSMOOTH.OUTPUT          OUTPUT {OUTPUT}.fits        IMAGE     NONE       FPA        TRUE      SIMPLE
-PPSMOOTH.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits     MASK      NONE       FPA        TRUE      SIMPLE
-PPSMOOTH.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits     VARIANCE  NONE       FPA        TRUE      SIMPLE
-
-PPBGRESTORE.OUTPUT      OUTPUT {OUTPUT}.fits         IMAGE     NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT               OUTPUT {OUTPUT}.fits                 IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTACK.OUTPUT.MASK          OUTPUT {OUTPUT}.mask.fits            MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTACK.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.weight.fits          VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXP           OUTPUT {OUTPUT}.exp.fits             IMAGE           EXP        FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPNUM        OUTPUT {OUTPUT}.num.fits             MASK            EXPNUM     FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPWT         OUTPUT {OUTPUT}.expwt.fits           VARIANCE        EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV               OUTPUT {OUTPUT}.unconv.fits          IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTACK.UNCONV.MASK          OUTPUT {OUTPUT}.unconv.mask.fits     MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTACK.UNCONV.VARIANCE      OUTPUT {OUTPUT}.unconv.wt.fits       VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTACK.UNCONV.EXP           OUTPUT {OUTPUT}.unconv.exp.fits      IMAGE           EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPNUM        OUTPUT {OUTPUT}.unconv.num.fits      MASK            EXPNUM     FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPWT         OUTPUT {OUTPUT}.unconv.expwt.fits    VARIANCE        EXP        FPA        TRUE      NONE
+PPSTACK.TARGET.PSF           OUTPUT {OUTPUT}.target.psf           PSF             NONE       CHIP       TRUE      NONE
+PPSTACK.CONV.KERNEL          OUTPUT {OUTPUT}.{FILE.INDEX}.kernel  SUBKERNEL       NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.JPEG1         OUTPUT {OUTPUT}.b1.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.JPEG2         OUTPUT {OUTPUT}.b2.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.CONFIG               OUTPUT {OUTPUT}.ppStack.mdc          TEXT            NONE       FPA        TRUE      NONE
+                                             
+PPSTAMP.OUTPUT               OUTPUT {OUTPUT}.fits                 IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTAMP.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits              MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTAMP.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits              VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTAMP.CHIP                 OUTPUT {OUTPUT}.ch.fits              IMAGE           NONE       CHIP       FALSE     NONE
+                                                     
+PPSIM.OUTPUT                 OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPSIM.FAKE.CHIP              OUTPUT {OUTPUT}.fake.fits            IMAGE           NONE       FPA        TRUE      SIMPLE
+PPSIM.FORCE.CHIP             OUTPUT {OUTPUT}.force.fits           IMAGE           NONE       FPA        TRUE      SIMPLE
+PPSIM.SOURCES                OUTPUT {OUTPUT}.cmf                  CMF             NONE       FPA        TRUE      NONE
+PPSIM.FAKE.SOURCES           OUTPUT {OUTPUT}.fake.cmf             CMF             NONE       FPA        TRUE      NONE
+PPSIM.FORCE.SOURCES          OUTPUT {OUTPUT}.force.cmf            CMF             NONE       FPA        TRUE      NONE
+                                                     
+PPARITH.OUTPUT.IMAGE         OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPARITH.OUTPUT.MASK          OUTPUT {OUTPUT}.fits                 MASK            NONE       FPA        TRUE      SIMPLE
+
+PPSKYCELL.JPEG1              OUTPUT {OUTPUT}.{FILE.INDEX}.b1.jpeg JPEG            NONE       CHIP       TRUE      NONE
+PPSKYCELL.JPEG2              OUTPUT {OUTPUT}.{FILE.INDEX}.b2.jpeg JPEG            NONE       CHIP       TRUE      NONE
+
+LOG.IMFILE                   OUTPUT {OUTPUT}.imfile.log           TEXT            NONE       FPA        TRUE      NONE
+LOG.EXP                      OUTPUT {OUTPUT}.exp.log              TEXT            NONE       FPA        TRUE      NONE
+
+TRACE.IMFILE                 OUTPUT {OUTPUT}.imfile.trace         TEXT            NONE       FPA        TRUE      NONE
+TRACE.EXP                    OUTPUT {OUTPUT}.exp.trace            TEXT            NONE       FPA        TRUE      NONE
+
+PPNOISEMAP.OUTPUT            OUTPUT {OUTPUT}.{CHIP.NAME}.fits     IMAGE           NONE       CHIP       TRUE      NONE
+
+CENSOR.OUTPUT                OUTPUT {OUTPUT}.smf                  CMF             NONE       FPA        TRUE      MEF
+
+MAGIC.ORIGINAL.PNG           OUTPUT {OUTPUT}_original.png         JPEG            NONE       FPA        TRUE      NONE
+MAGIC.RESIDUAL.PNG           OUTPUT {OUTPUT}_residual.png         JPEG            NONE       FPA        TRUE      NONE
+MAGIC.MASK.PNG               OUTPUT {OUTPUT}_mask.png             JPEG            NONE       FPA        TRUE      NONE
+MAGIC.DUPLICATE.PNG          OUTPUT {OUTPUT}_duplicate.png        JPEG            NONE       FPA        TRUE      NONE
+
+PPSMOOTH.OUTPUT              OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      SIMPLE
+PPSMOOTH.OUTPUT.MASK         OUTPUT {OUTPUT}.mk.fits              MASK            NONE       FPA        TRUE      SIMPLE
+PPSMOOTH.OUTPUT.VARIANCE     OUTPUT {OUTPUT}.wt.fits              VARIANCE        NONE       FPA        TRUE      SIMPLE
+
+PPBGRESTORE.OUTPUT           OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      NONE
Index: branches/czw_branch/20100427/ippconfig/recipes/filerules-split.mdc
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/filerules-split.mdc	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/filerules-split.mdc	(revision 28017)
@@ -21,283 +21,302 @@
 ### replace @DETDB with @FILES if you want to require it from the 
 ### command line, or with an explicit name to require a specific file
-TYPE                    INPUT    FILENAME.RULE DATA.LEVEL FILE.TYPE
+TYPE                      INPUT    FILENAME.RULE DATA.LEVEL FILE.TYPE
 
 ## files used by ppImage
-PPIMAGE.INPUT           INPUT    @FILES        CHIP       IMAGE
-PPIMAGE.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-PPIMAGE.INPUT.VARIANCE  INPUT    @FILES        CHIP       VARIANCE
-PPIMAGE.INPUT.PSF       INPUT    @FILES        CHIP       PSF
-PPIMAGE.INPUT.SRC       INPUT    @FILES        CHIP       CMF
-PPIMAGE.MASK            INPUT    @DETDB        CHIP       MASK
-PPIMAGE.BIAS            INPUT    @DETDB        CHIP       IMAGE
-PPIMAGE.NOISEMAP        INPUT    @DETDB        CHIP       IMAGE
-PPIMAGE.DARK            INPUT    @DETDB        CHIP       DARK
-PPIMAGE.FLAT            INPUT    @DETDB        CHIP       IMAGE
-PPIMAGE.FRINGE     	INPUT 	 @DETDB        CHIP       FRINGE
-PPIMAGE.SHUTTER         INPUT    @DETDB        CHIP       IMAGE
+PPIMAGE.INPUT             INPUT    @FILES        CHIP       IMAGE
+PPIMAGE.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PPIMAGE.INPUT.VARIANCE    INPUT    @FILES        CHIP       VARIANCE
+PPIMAGE.INPUT.PSF         INPUT    @FILES        CHIP       PSF
+PPIMAGE.INPUT.SRC         INPUT    @FILES        CHIP       CMF
+PPIMAGE.MASK              INPUT    @DETDB        CHIP       MASK
+PPIMAGE.BIAS              INPUT    @DETDB        CHIP       IMAGE
+PPIMAGE.NOISEMAP          INPUT    @DETDB        CHIP       IMAGE
+PPIMAGE.DARK              INPUT    @DETDB        CHIP       DARK
+PPIMAGE.FLAT              INPUT    @DETDB        CHIP       IMAGE
+PPIMAGE.FRINGE            INPUT    @DETDB        CHIP       FRINGE
+PPIMAGE.SHUTTER           INPUT    @DETDB        CHIP       IMAGE
 
 ## Files used by ppMerge
-PPMERGE.INPUT           INPUT    @FILES        CHIP       IMAGE
-PPMERGE.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-PPMERGE.INPUT.VARIANCE  INPUT    @FILES        CHIP       VARIANCE
+PPMERGE.INPUT             INPUT    @FILES        CHIP       IMAGE
+PPMERGE.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PPMERGE.INPUT.VARIANCE    INPUT    @FILES        CHIP       VARIANCE
 
 ## files used to build and apply the flat-field correction images
-DVOCORR.INPUT      	INPUT 	 @FILES        CHIP       IMAGE
-DVOCORR.REFHEAD    	INPUT 	 @FILES        CHIP       HEADER
-DVOFLAT.INPUT      	INPUT 	 @FILES        CHIP       IMAGE
-DVOFLAT.CORR       	INPUT 	 @DETDB        CHIP       IMAGE
+DVOCORR.INPUT             INPUT    @FILES        CHIP       IMAGE
+DVOCORR.REFHEAD           INPUT    @FILES        CHIP       HEADER
+DVOFLAT.INPUT             INPUT    @FILES        CHIP       IMAGE
+DVOFLAT.CORR              INPUT    @DETDB        CHIP       IMAGE
 
 ## files used by psphot
-PSPHOT.LOAD             INPUT    @FILES        CHIP       IMAGE
-PSPHOT.INPUT            INPUT    @FILES        CHIP       IMAGE
-PSPHOT.MASK             INPUT    @FILES        CHIP       MASK     
-PSPHOT.VARIANCE         INPUT    @FILES        CHIP       VARIANCE     
-PSPHOT.PSF.LOAD         INPUT    @FILES        CHIP       PSF       
-PSPHOT.INPUT.CMF        INPUT    @FILES        CHIP       CMF       
-PSPHOT.INPUT.TEXT       INPUT    @FILES        CHIP       SRCTEXT       
+PSPHOT.LOAD               INPUT    @FILES        CHIP       IMAGE
+PSPHOT.INPUT              INPUT    @FILES        CHIP       IMAGE
+PSPHOT.MASK               INPUT    @FILES        CHIP       MASK     
+PSPHOT.VARIANCE           INPUT    @FILES        CHIP       VARIANCE     
+PSPHOT.PSF.LOAD           INPUT    @FILES        CHIP       PSF       
+PSPHOT.INPUT.CMF          INPUT    @FILES        CHIP       CMF       
+PSPHOT.INPUT.TEXT         INPUT    @FILES        CHIP       SRCTEXT       
+
+## files used by psphotStack
+PSPHOT.STACK.INPUT.RAW    INPUT    @FILES        CHIP       IMAGE
+PSPHOT.STACK.MASK.RAW     INPUT    @FILES        CHIP       MASK     
+PSPHOT.STACK.VARIANCE.RAW INPUT    @FILES        CHIP       VARIANCE     
+PSPHOT.STACK.PSF.RAW      INPUT    @FILES        CHIP       PSF       
+PSPHOT.STACK.INPUT.CNV    INPUT    @FILES        CHIP       IMAGE
+PSPHOT.STACK.MASK.CNV     INPUT    @FILES        CHIP       MASK     
+PSPHOT.STACK.VARIANCE.CNV INPUT    @FILES        CHIP       VARIANCE     
+PSPHOT.STACK.PSF.CNV      INPUT    @FILES        CHIP       PSF       
+PSPHOT.STACK.SOURCES      INPUT    @FILES        FPA        CMF
 
 ## files used by psastro 
-PSASTRO.INPUT.CMP       INPUT    @FILES        CHIP       CMP
-PSASTRO.INPUT.CMF       INPUT    @FILES        CHIP       CMF
-PSASTRO.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-PSASTRO.REFMASK         INPUT    @DETDB        CHIP       MASK
-PSASTRO.WCS             INPUT    @FILES        CHIP       WCS
-PSASTRO.MODEL           INPUT    @DETDB        FPA        ASTROM
-
-PSASTRO.EXTRACT.ASTROM  INPUT    @FILES        CHIP       CMF
-PSASTRO.EXTRACT.INPUT   INPUT    @FILES        CHIP       IMAGE
-
-## files used by pswarp
-PSWARP.INPUT            INPUT    @FILES        CHIP       IMAGE
-PSWARP.VARIANCE         INPUT    @FILES        CHIP       VARIANCE
-PSWARP.MASK             INPUT    @FILES        CHIP       MASK
-PSWARP.SKYCELL          INPUT    @FILES        FPA        IMAGE
-PSWARP.ASTROM           INPUT    @FILES        CHIP       CMF
-
-## files used by ppsub
-PPSUB.INPUT             INPUT    @FILES        FPA        IMAGE
-PPSUB.INPUT.MASK        INPUT    @FILES        FPA        MASK
-PPSUB.INPUT.VARIANCE    INPUT    @FILES        FPA        VARIANCE
-PPSUB.INPUT.SOURCES    	INPUT 	 @FILES        FPA        CMF
-PPSUB.REF               INPUT    @FILES        FPA        IMAGE
-PPSUB.REF.MASK          INPUT    @FILES        FPA        MASK
-PPSUB.REF.VARIANCE      INPUT    @FILES        FPA        VARIANCE
-PPSUB.REF.SOURCES    	INPUT 	 @FILES        FPA        CMF
-PPSUB.INPUT.KERNEL      INPUT    @FILES        FPA        SUBKERNEL
-
-## files used by ppstack
-PPSTACK.INPUT           INPUT    @FILES        FPA        IMAGE
-PPSTACK.INPUT.MASK      INPUT    @FILES        FPA        MASK
-PPSTACK.INPUT.VARIANCE  INPUT    @FILES        FPA        VARIANCE
-PPSTACK.INPUT.PSF  	INPUT 	 @FILES        CHIP       PSF
-PPSTACK.INPUT.SOURCES   INPUT    @FILES        FPA        CMF
-
-## files used by ppstamp
-PPSTAMP.INPUT           INPUT    @FILES        CHIP       IMAGE
-PPSTAMP.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-PPSTAMP.INPUT.VARIANCE  INPUT    @FILES        CHIP       VARIANCE
-
-# files used by pparith
-PPARITH.INPUT.IMAGE     INPUT    @FILES        CHIP       IMAGE
-PPARITH.INPUT.MASK      INPUT    @FILES        CHIP       MASK
-
-PPSKYCELL.IMAGE      	INPUT 	 @FILES        CHIP       IMAGE
-PPSKYCELL.MASK      	INPUT 	 @FILES        CHIP       MASK
-
-PPSIM.INPUT             INPUT    @FILES        CHIP       IMAGE     
-PPSIM.REAL.SOURCES      INPUT    @FILES        CHIP       CMF       
+PSASTRO.INPUT.CMP         INPUT    @FILES        CHIP       CMP
+PSASTRO.INPUT.CMF         INPUT    @FILES        CHIP       CMF
+PSASTRO.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PSASTRO.REFMASK           INPUT    @DETDB        CHIP       MASK
+PSASTRO.WCS               INPUT    @FILES        CHIP       WCS
+PSASTRO.MODEL             INPUT    @DETDB        FPA        ASTROM
+                          
+PSASTRO.EXTRACT.ASTROM    INPUT    @FILES        CHIP       CMF
+PSASTRO.EXTRACT.INPUT     INPUT    @FILES        CHIP       IMAGE
+                          
+## files used by pswarp   
+PSWARP.INPUT              INPUT    @FILES        CHIP       IMAGE
+PSWARP.VARIANCE           INPUT    @FILES        CHIP       VARIANCE
+PSWARP.MASK               INPUT    @FILES        CHIP       MASK
+PSWARP.SKYCELL            INPUT    @FILES        FPA        IMAGE
+PSWARP.ASTROM             INPUT    @FILES        CHIP       CMF
+                          
+## files used by ppsub    
+PPSUB.INPUT               INPUT    @FILES        FPA        IMAGE
+PPSUB.INPUT.MASK          INPUT    @FILES        FPA        MASK
+PPSUB.INPUT.VARIANCE      INPUT    @FILES        FPA        VARIANCE
+PPSUB.INPUT.SOURCES       INPUT    @FILES        FPA        CMF
+PPSUB.INPUT.KERNEL        INPUT    @FILES        FPA        SUBKERNEL
+PPSUB.REF                 INPUT    @FILES        FPA        IMAGE
+PPSUB.REF.MASK            INPUT    @FILES        FPA        MASK
+PPSUB.REF.VARIANCE        INPUT    @FILES        FPA        VARIANCE
+PPSUB.REF.SOURCES         INPUT    @FILES        FPA        CMF
+                          
+## files used by ppstack  
+PPSTACK.INPUT             INPUT    @FILES        FPA        IMAGE
+PPSTACK.INPUT.MASK        INPUT    @FILES        FPA        MASK
+PPSTACK.INPUT.VARIANCE    INPUT    @FILES        FPA        VARIANCE
+PPSTACK.INPUT.PSF         INPUT    @FILES        CHIP       PSF
+PPSTACK.INPUT.SOURCES     INPUT    @FILES        FPA        CMF
+                          
+## files used by ppstamp  
+PPSTAMP.INPUT             INPUT    @FILES        CHIP       IMAGE
+PPSTAMP.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+PPSTAMP.INPUT.VARIANCE    INPUT    @FILES        CHIP       VARIANCE
+                          
+# files used by pparith   
+PPARITH.INPUT.IMAGE       INPUT    @FILES        CHIP       IMAGE
+PPARITH.INPUT.MASK        INPUT    @FILES        CHIP       MASK
+                          
+PPSKYCELL.IMAGE           INPUT    @FILES        CHIP       IMAGE
+PPSKYCELL.MASK            INPUT    @FILES        CHIP       MASK
+                          
+PPSIM.INPUT               INPUT    @FILES        CHIP       IMAGE     
+PPSIM.REAL.SOURCES        INPUT    @FILES        CHIP       CMF       
+
+PPCOORD.ASTROM		  INPUT	   @FILES	 FPA	    WCS
+PPCOORD.RAW		  INPUT	   @FILES	 CHIP	    IMAGE
 
 ## files used by ppNoiseMap
-PPNOISEMAP.INPUT        INPUT    @FILES        CHIP       IMAGE
+PPNOISEMAP.INPUT          INPUT    @FILES        CHIP       IMAGE
 
 ## files used by censorObject 
-CENSOR.INPUT       	INPUT    @FILES        CHIP       CMF
-CENSOR.INPUT.MASK       INPUT    @FILES        CHIP       MASK
+CENSOR.INPUT              INPUT    @FILES        CHIP       CMF
+CENSOR.INPUT.MASK         INPUT    @FILES        CHIP       MASK
 
 ## Files used by ppSmooth
-PPSMOOTH.INPUT          INPUT    @FILES        CHIP       IMAGE
-PPSMOOTH.INPUT.MASK     INPUT    @FILES        CHIP       MASK
-PPSMOOTH.INPUT.VARIANCE INPUT    @FILES        CHIP       VARIANCE
+PPSMOOTH.INPUT            INPUT    @FILES        CHIP       IMAGE
+PPSMOOTH.INPUT.MASK       INPUT    @FILES        CHIP       MASK
+PPSMOOTH.INPUT.VARIANCE   INPUT    @FILES        CHIP       VARIANCE
 
 ## Files used by ppbgrestore
-PPBGRESTORE.INPUT       INPUT    @FILES        CHIP       IMAGE
-PPBGRESTORE.BACKMDL     INPUT    @FILES        CHIP       IMAGE
-
-PPVIZPATTERN.INPUT	INPUT	 @FILES	       CHIP	  PATTERN
+PPBGRESTORE.INPUT         INPUT    @FILES        CHIP       IMAGE
+PPBGRESTORE.BACKMDL       INPUT    @FILES        CHIP       IMAGE
+                          
+PPVIZPATTERN.INPUT        INPUT    @FILES        CHIP       PATTERN
 
 ### output file definitions
-TYPE                    OUTPUT FILENAME.RULE                     FILE.TYPE FITS.TYPE  DATA.LEVEL FILE.SAVE FILE.FORMAT
-PPIMAGE.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     COMP_IMG   CHIP       TRUE      NONE
-PPIMAGE.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK      COMP_MASK  CHIP       TRUE      NONE
-PPIMAGE.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits      VARIANCE  COMP_WT    CHIP       TRUE      NONE
-PPIMAGE.OUTPUT.DETMASK  OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     DET_MASK   CHIP       TRUE      NONE
-PPIMAGE.OUTPUT.DETREND  OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPIMAGE.OUTPUT.RESID    OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPIMAGE.CONFIG          OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc  TEXT      NONE       CHIP       TRUE      NONE
-	        									        
-PPIMAGE.CHIP            OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE     COMP_IMG   CHIP       TRUE      NONE
-PPIMAGE.CHIP.DETMASK    OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE     NONE       CHIP       TRUE      NONE
-PPIMAGE.CHIP.MASK       OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits   MASK      COMP_MASK  CHIP       TRUE      NONE
-PPIMAGE.CHIP.VARIANCE   OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits   VARIANCE  COMP_WT    CHIP       TRUE      NONE
-PPIMAGE.CHIP.RESID      OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE     NONE       CHIP       TRUE      NONE
-		        									        
-PPIMAGE.OUTPUT.FPA1     OUTPUT {OUTPUT}.b1.fits                  IMAGE     NONE       FPA        TRUE      NONE
-PPIMAGE.OUTPUT.FPA2     OUTPUT {OUTPUT}.b2.fits                  IMAGE     NONE       FPA        TRUE      NONE
-		        									        
-PPIMAGE.BIN1            OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits      IMAGE     NONE       CHIP       TRUE      NONE
-PPIMAGE.BIN2            OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits      IMAGE     NONE       CHIP       TRUE      NONE
-		        									        
-PPIMAGE.JPEG1           OUTPUT {OUTPUT}.b1.jpg                   JPEG      NONE       FPA        TRUE      NONE
-PPIMAGE.JPEG2           OUTPUT {OUTPUT}.b2.jpg                   JPEG      NONE       FPA        TRUE      NONE
-PPIMAGE.PATTERN		OUTPUT {OUTPUT}.{CHIP.NAME}.ptn		 PATTERN   NONE	      CHIP	 TRUE	   NONE
-PPIMAGE.STATS           OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS     NONE       CHIP       TRUE      NONE
+TYPE                         OUTPUT FILENAME.RULE                     FILE.TYPE       FITS.TYPE  DATA.LEVEL FILE.SAVE FILE.FORMAT
+PPIMAGE.OUTPUT               OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           COMP_IMG   CHIP       TRUE      NONE
+PPIMAGE.OUTPUT.MASK          OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK            COMP_MASK  CHIP       TRUE      NONE
+PPIMAGE.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits      VARIANCE        COMP_WT    CHIP       TRUE      NONE
+PPIMAGE.OUTPUT.DETMASK       OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           DET_MASK   CHIP       TRUE      NONE
+PPIMAGE.OUTPUT.DETREND       OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPIMAGE.OUTPUT.RESID         OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPIMAGE.CONFIG               OUTPUT {OUTPUT}.{CHIP.NAME}.ppImage.mdc  TEXT            NONE       CHIP       TRUE      NONE
+                                                                                                      
+PPIMAGE.CHIP                 OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE           COMP_IMG   CHIP       TRUE      NONE
+PPIMAGE.CHIP.DETMASK         OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE           NONE       CHIP       TRUE      NONE
+PPIMAGE.CHIP.MASK            OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits   MASK            COMP_MASK  CHIP       TRUE      NONE
+PPIMAGE.CHIP.VARIANCE        OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits   VARIANCE        COMP_WT    CHIP       TRUE      NONE
+PPIMAGE.CHIP.RESID           OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE           NONE       CHIP       TRUE      NONE
+                                                                                                              
+PPIMAGE.OUTPUT.FPA1          OUTPUT {OUTPUT}.b1.fits                  IMAGE           NONE       FPA        TRUE      NONE
+PPIMAGE.OUTPUT.FPA2          OUTPUT {OUTPUT}.b2.fits                  IMAGE           NONE       FPA        TRUE      NONE
+                                                                                                              
+PPIMAGE.BIN1                 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits      IMAGE           NONE       CHIP       TRUE      NONE
+PPIMAGE.BIN2                 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits      IMAGE           NONE       CHIP       TRUE      NONE
+                                                                                                              
+PPIMAGE.JPEG1                OUTPUT {OUTPUT}.b1.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPIMAGE.JPEG2                OUTPUT {OUTPUT}.b2.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPIMAGE.PATTERN              OUTPUT {OUTPUT}.{CHIP.NAME}.ptn          PATTERN         NONE       CHIP       TRUE      NONE
+PPIMAGE.STATS                OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS           NONE       CHIP       TRUE      NONE
 
 ## note: these use the  same output naming convention since they are used for different ppMerge runs
-PPMERGE.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.fits         MASK      DET_MASK   CHIP       TRUE      NONE
-PPMERGE.OUTPUT.BIAS     OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPMERGE.OUTPUT.DARK     OUTPUT {OUTPUT}.{CHIP.NAME}.fits         DARK      NONE       CHIP       TRUE      NONE
-PPMERGE.OUTPUT.SHUTTER  OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPMERGE.OUTPUT.FLAT     OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPMERGE.OUTPUT.FRINGE   OUTPUT {OUTPUT}.{CHIP.NAME}.fits         FRINGE    NONE       CELL       TRUE      NONE
-PPMERGE.OUTPUT.SIGMA    OUTPUT {OUTPUT}.{CHIP.NAME}.sigma.fits   IMAGE     NONE       CELL       TRUE      NONE
-PPMERGE.OUTPUT.COUNT    OUTPUT {OUTPUT}.{CHIP.NAME}.count.fits   IMAGE     NONE       CELL       TRUE      NONE
-		        									        
-DVOCORR.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits      IMAGE     NONE       CHIP       TRUE      NONE
-DVOFLAT.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits      IMAGE     NONE       CHIP       TRUE      NONE
-		        									        
-PSPHOT.RESID            OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits     IMAGE     COMP_SUB   CHIP       TRUE      NONE
-PSPHOT.BACKGND          OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits     IMAGE     COMP_IMG   CHIP       TRUE      NONE
-PSPHOT.BACKSUB          OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits     IMAGE     COMP_SUB   CHIP       TRUE      NONE
-PSPHOT.BACKMDL          OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits     IMAGE     NONE       CHIP       TRUE      NONE
-PSPHOT.BACKMDL.MEF      OUTPUT {OUTPUT}.mdl.fits                 IMAGE     NONE       CHIP       TRUE      NONE
-		        									        
-PSPHOT.OUTPUT.RAW       OUTPUT {OUTPUT}.{CHIP.NAME}              RAW       NONE       CHIP       TRUE      NONE
-PSPHOT.OUTPUT.SX        OUTPUT {OUTPUT}.{CHIP.NAME}.sx           SX        NONE       CHIP       TRUE      NONE
-PSPHOT.OUTPUT.OBJ       OUTPUT {OUTPUT}.{CHIP.NAME}.obj          OBJ       NONE       CHIP       TRUE      NONE
-PSPHOT.OUTPUT.CMP       OUTPUT {OUTPUT}.{CHIP.NAME}.cmp          CMP       NONE       CHIP       TRUE      NONE
-PSPHOT.OUT.CMF.SPL      OUTPUT {OUTPUT}.{CHIP.NAME}.cmf          CMF       NONE       CHIP       TRUE      NONE
-PSPHOT.OUT.CMF.MEF      OUTPUT {OUTPUT}.cmf                      CMF       NONE       FPA        TRUE      MEF
-PSPHOT.PSF.RAW.SAVE     OUTPUT {OUTPUT}.{CHIP.NAME}.psf          PSF       NONE       CHIP       TRUE      MEF
-PSPHOT.PSF.SKY.SAVE     OUTPUT {OUTPUT}.psf          		 PSF       NONE       FPA        TRUE      MEF
-		        									        
+PPMERGE.OUTPUT.MASK          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         MASK            DET_MASK   CHIP       TRUE      NONE
+PPMERGE.OUTPUT.BIAS          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPMERGE.OUTPUT.DARK          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         DARK            NONE       CHIP       TRUE      NONE
+PPMERGE.OUTPUT.SHUTTER       OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPMERGE.OUTPUT.FLAT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPMERGE.OUTPUT.FRINGE        OUTPUT {OUTPUT}.{CHIP.NAME}.fits         FRINGE          NONE       CELL       TRUE      NONE
+PPMERGE.OUTPUT.SIGMA         OUTPUT {OUTPUT}.{CHIP.NAME}.sigma.fits   IMAGE           NONE       CELL       TRUE      NONE
+PPMERGE.OUTPUT.COUNT         OUTPUT {OUTPUT}.{CHIP.NAME}.count.fits   IMAGE           NONE       CELL       TRUE      NONE
+                                                                                                              
+DVOCORR.OUTPUT               OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits      IMAGE           NONE       CHIP       TRUE      NONE
+DVOFLAT.OUTPUT               OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits      IMAGE           NONE       CHIP       TRUE      NONE
+                                                                                                              
+PSPHOT.RESID                 OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits     IMAGE           COMP_SUB   CHIP       TRUE      NONE
+PSPHOT.BACKGND               OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits     IMAGE           COMP_IMG   CHIP       TRUE      NONE
+PSPHOT.BACKSUB               OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits     IMAGE           COMP_SUB   CHIP       TRUE      NONE
+PSPHOT.BACKMDL               OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits     IMAGE           NONE       CHIP       TRUE      NONE
+PSPHOT.BACKMDL.MEF           OUTPUT {OUTPUT}.mdl.fits                 IMAGE           NONE       CHIP       TRUE      NONE
+                                                                                                              
+PSPHOT.OUTPUT.RAW            OUTPUT {OUTPUT}.{CHIP.NAME}              RAW             NONE       CHIP       TRUE      NONE
+PSPHOT.OUTPUT.SX             OUTPUT {OUTPUT}.{CHIP.NAME}.sx           SX              NONE       CHIP       TRUE      NONE
+PSPHOT.OUTPUT.OBJ            OUTPUT {OUTPUT}.{CHIP.NAME}.obj          OBJ             NONE       CHIP       TRUE      NONE
+PSPHOT.OUTPUT.CMP            OUTPUT {OUTPUT}.{CHIP.NAME}.cmp          CMP             NONE       CHIP       TRUE      NONE
+PSPHOT.OUT.CMF.SPL           OUTPUT {OUTPUT}.{CHIP.NAME}.cmf          CMF             NONE       CHIP       TRUE      NONE
+PSPHOT.OUT.CMF.MEF           OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      MEF
+PSPHOT.PSF.RAW.SAVE          OUTPUT {OUTPUT}.{CHIP.NAME}.psf          PSF             NONE       CHIP       TRUE      MEF
+PSPHOT.PSF.SKY.SAVE          OUTPUT {OUTPUT}.psf                      PSF             NONE       FPA        TRUE      MEF
+                                                                                                              
 # outputs for psphotStack:
-PSPHOT.CHISQ.IMAGE      OUTPUT {OUTPUT}.chisq.im.fits IMAGE    NONE       FPA        TRUE      SIMPLE
-PSPHOT.CHISQ.MASK       OUTPUT {OUTPUT}.chisq.mk.fits MASK     NONE       FPA        TRUE      SIMPLE
-PSPHOT.CHISQ.VARIANCE   OUTPUT {OUTPUT}.chisq.wt.fits VARIANCE NONE       FPA        TRUE      SIMPLE
-PSPHOT.STACK.OUTPUT     OUTPUT {OUTPUT}.{FILE.ID}.cmf CMF      NONE       FPA        TRUE      NONE
+PSPHOT.CHISQ.IMAGE           OUTPUT {OUTPUT}.chisq.im.fits            IMAGE           NONE       FPA        TRUE      NONE
+PSPHOT.CHISQ.MASK            OUTPUT {OUTPUT}.chisq.mk.fits            MASK            NONE       FPA        TRUE      NONE
+PSPHOT.CHISQ.VARIANCE        OUTPUT {OUTPUT}.chisq.wt.fits            VARIANCE        NONE       FPA        TRUE      NONE
+PSPHOT.STACK.OUTPUT.IMAGE    OUTPUT {OUTPUT}.{FILE.ID}.im.fits        IMAGE           NONE       FPA        TRUE      NONE
+PSPHOT.STACK.OUTPUT.MASK     OUTPUT {OUTPUT}.{FILE.ID}.mk.fits        MASK            NONE       FPA        TRUE      NONE
+PSPHOT.STACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{FILE.ID}.wt.fits        VARIANCE        NONE       FPA        TRUE      NONE
+PSPHOT.STACK.OUTPUT          OUTPUT {OUTPUT}.{FILE.ID}.cmf            CMF             NONE       FPA        TRUE      NONE
                                                      
-SOURCE.PLOT.RAW.MOMENTS  OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png      KAPA      NONE       CHIP       TRUE      NONE
-SOURCE.PLOT.RAW.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png      KAPA      NONE       CHIP       TRUE      NONE
-SOURCE.PLOT.RAW.APRESID  OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png      KAPA      NONE       CHIP       TRUE      NONE
-		        									        
-SOURCE.PLOT.SKY.MOMENTS  OUTPUT {OUTPUT}.mnt.png      KAPA      NONE       CHIP       TRUE      NONE
-SOURCE.PLOT.SKY.PSFMODEL OUTPUT {OUTPUT}.psf.png      KAPA      NONE       CHIP       TRUE      NONE
-SOURCE.PLOT.SKY.APRESID  OUTPUT {OUTPUT}.dap.png      KAPA      NONE       CHIP       TRUE      NONE
-
-# PSASTRO.OUTPUT.CMP      OUTPUT {OUTPUT}.{CHIP.NAME}.smp          CMP       NONE       CHIP       TRUE      NONE
-# PSASTRO.OUT.CMF.SPL     OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF       NONE       CHIP       TRUE      NONE
-# PSASTRO.OUT.CMF.MEF     OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
-PSASTRO.OUT.MODEL       OUTPUT {OUTPUT}.asm               ASTROM.MODEL     NONE       FPA        TRUE      NONE
-PSASTRO.OUT.REFSTARS    OUTPUT {OUTPUT}.aref.fits         ASTROM.REFSTARS  NONE       FPA        TRUE      NONE
-PSASTRO.OUTPUT          OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
-PSASTRO.STATS           OUTPUT {OUTPUT}.stats                    STATS     NONE       FPA        TRUE      NONE
-PSASTRO.CONFIG          OUTPUT {OUTPUT}.psastro.mdc              TEXT      NONE       FPA        TRUE      NONE
-PSASTRO.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK      COMP_MASK  CHIP       TRUE      NONE
-		        									        
-PSWARP.OUTPUT           OUTPUT {OUTPUT}.fits                     IMAGE     COMP_IMG   FPA        TRUE      NONE
-PSWARP.OUTPUT.MASK      OUTPUT {OUTPUT}.mask.fits                MASK      COMP_MASK  FPA        TRUE      NONE
-PSWARP.OUTPUT.VARIANCE  OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE
-PSWARP.OUTPUT.SOURCES   OUTPUT {OUTPUT}.cmf                      CMF       NONE       FPA        TRUE      NONE
-PSWARP.BIN1             OUTPUT {OUTPUT}.b1.fits                  IMAGE     NONE       FPA        TRUE      NONE
-PSWARP.BIN2             OUTPUT {OUTPUT}.b2.fits                  IMAGE     NONE       FPA        TRUE      NONE
-PSWARP.CONFIG           OUTPUT {OUTPUT}.pswarp.mdc               TEXT      NONE       FPA        TRUE      NONE
-		        									        
-SKYCELL.STATS           OUTPUT {OUTPUT}.stats                    STATS     NONE       FPA        TRUE      NONE
-SKYCELL.TEMPLATE        OUTPUT {OUTPUT}.skycell                  SKYCELL   NONE       FPA        TRUE      NONE
-		        									        
-PPSUB.OUTPUT            OUTPUT {OUTPUT}.fits                     IMAGE     COMP_SUB   FPA        TRUE      NONE
-PPSUB.OUTPUT.MASK       OUTPUT {OUTPUT}.mask.fits                MASK      COMP_MASK  FPA        TRUE      NONE
-PPSUB.OUTPUT.VARIANCE   OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE
-PPSUB.OUTPUT.SOURCES    OUTPUT {OUTPUT}.cmf                      CMF       NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.KERNELS    OUTPUT {OUTPUT}.subkernel                SUBKERNEL NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.JPEG1      OUTPUT {OUTPUT}.b1.jpg                   JPEG      NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.JPEG2      OUTPUT {OUTPUT}.b2.jpg                   JPEG      NONE       FPA        TRUE      NONE
-PPSUB.OUTPUT.RESID.JPEG OUTPUT {OUTPUT}.res.jpg                  JPEG      NONE       FPA        TRUE      NONE
-PPSUB.INVERSE           OUTPUT {OUTPUT}.inv.fits                 IMAGE     COMP_SUB   FPA        TRUE      NONE
-PPSUB.INVERSE.MASK      OUTPUT {OUTPUT}.inv.mask.fits            MASK      COMP_MASK  FPA        TRUE      NONE
-PPSUB.INVERSE.VARIANCE  OUTPUT {OUTPUT}.inv.wt.fits              VARIANCE  COMP_WT    FPA        TRUE      NONE
-PPSUB.INVERSE.SOURCES   OUTPUT {OUTPUT}.inv.cmf                  CMF       NONE       FPA        TRUE      NONE
-PPSUB.CONFIG            OUTPUT {OUTPUT}.ppSub.mdc                TEXT      NONE       FPA        TRUE      NONE
-PPSUB.INPUT.CONV        OUTPUT {OUTPUT}.inConv.fits              IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSUB.INPUT.CONV.MASK   OUTPUT {OUTPUT}.inConv.mk.fits           MASK      COMP_MASK  FPA        TRUE      NONE
-PPSUB.INPUT.CONV.VARIANCE OUTPUT {OUTPUT}.inConv.wt.fits         VARIANCE  COMP_WT    FPA        TRUE      NONE
-PPSUB.REF.CONV          OUTPUT {OUTPUT}.refConv.fits             IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSUB.REF.CONV.MASK     OUTPUT {OUTPUT}.refConv.mk.fits          MASK      COMP_MASK  FPA        TRUE      NONE
-PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits          VARIANCE  COMP_WT    FPA        TRUE      NONE
-											        
-PPSTACK.OUTPUT          OUTPUT {OUTPUT}.fits                     IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSTACK.OUTPUT.MASK     OUTPUT {OUTPUT}.mask.fits                MASK      COMP_MASK  FPA        TRUE      NONE
-PPSTACK.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE
-PPSTACK.OUTPUT.EXP	OUTPUT {OUTPUT}.exp.fits     		 IMAGE     EXP	      FPA	 TRUE      NONE
-PPSTACK.OUTPUT.EXPNUM	OUTPUT {OUTPUT}.num.fits     		 MASK      EXPNUM     FPA	 TRUE      NONE
-PPSTACK.OUTPUT.EXPWT	OUTPUT {OUTPUT}.expwt.fits               VARIANCE  EXP	      FPA	 TRUE      NONE
-PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits              IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSTACK.UNCONV.MASK     OUTPUT {OUTPUT}.unconv.mask.fits         MASK      COMP_MASK  FPA        TRUE      NONE
-PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits           VARIANCE  COMP_WT    FPA        TRUE      NONE
-PPSTACK.UNCONV.EXP	OUTPUT {OUTPUT}.unconv.exp.fits 	 IMAGE     EXP	      FPA	 TRUE      NONE
-PPSTACK.UNCONV.EXPNUM	OUTPUT {OUTPUT}.unconv.num.fits 	 MASK  	   EXPNUM     FPA	 TRUE      NONE
-PPSTACK.UNCONV.EXPWT	OUTPUT {OUTPUT}.unconv.expwt.fits        VARIANCE  EXP	      FPA	 TRUE      NONE
-PPSTACK.TARGET.PSF      OUTPUT {OUTPUT}.target.psf               PSF       NONE       CHIP       TRUE      NONE
-PPSTACK.CONV.KERNEL     OUTPUT {OUTPUT}.{FILE.INDEX}.kernel      SUBKERNEL NONE       FPA        TRUE      NONE
-PPSTACK.OUTPUT.JPEG1	OUTPUT {OUTPUT}.b1.jpg                   JPEG      NONE       FPA        TRUE      NONE
-PPSTACK.OUTPUT.JPEG2	OUTPUT {OUTPUT}.b2.jpg                   JPEG      NONE       FPA        TRUE      NONE
-PPSTACK.CONFIG          OUTPUT {OUTPUT}.ppStack.mdc              TEXT      NONE       FPA        TRUE      NONE
-
-PPSTAMP.OUTPUT          OUTPUT {OUTPUT}.fits                     IMAGE     COMP_IMG   FPA        TRUE      NONE
-PPSTAMP.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits                  MASK      COMP_MASK  FPA        TRUE      NONE
-PPSTAMP.OUTPUT.VARIANCE OUTPUT {OUTPUT}.wt.fits                  VARIANCE  COMP_WT    FPA        TRUE      NONE
+SOURCE.PLOT.RAW.MOMENTS      OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png      KAPA            NONE       CHIP       TRUE      NONE
+SOURCE.PLOT.RAW.PSFMODEL     OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png      KAPA            NONE       CHIP       TRUE      NONE
+SOURCE.PLOT.RAW.APRESID      OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png      KAPA            NONE       CHIP       TRUE      NONE
+                                                                                                              
+SOURCE.PLOT.SKY.MOMENTS      OUTPUT {OUTPUT}.mnt.png                  KAPA            NONE       CHIP       TRUE      NONE
+SOURCE.PLOT.SKY.PSFMODEL     OUTPUT {OUTPUT}.psf.png                  KAPA            NONE       CHIP       TRUE      NONE
+SOURCE.PLOT.SKY.APRESID      OUTPUT {OUTPUT}.dap.png                  KAPA            NONE       CHIP       TRUE      NONE
+
+# PSASTRO.OUTPUT.CMP         OUTPUT {OUTPUT}.{CHIP.NAME}.smp          CMP             NONE       CHIP       TRUE      NONE
+# PSASTRO.OUT.CMF.SPL        OUTPUT {OUTPUT}.{CHIP.NAME}.smf          CMF             NONE       CHIP       TRUE      NONE
+# PSASTRO.OUT.CMF.MEF        OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
+PSASTRO.OUT.MODEL            OUTPUT {OUTPUT}.asm                      ASTROM.MODEL    NONE       FPA        TRUE      NONE
+PSASTRO.OUT.REFSTARS         OUTPUT {OUTPUT}.aref.fits                ASTROM.REFSTARS NONE       FPA        TRUE      NONE
+PSASTRO.OUTPUT               OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
+PSASTRO.STATS                OUTPUT {OUTPUT}.stats                    STATS           NONE       FPA        TRUE      NONE
+PSASTRO.CONFIG               OUTPUT {OUTPUT}.psastro.mdc              TEXT            NONE       FPA        TRUE      NONE
+PSASTRO.OUTPUT.MASK          OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK            COMP_MASK  CHIP       TRUE      NONE
+                                                                                                              
+PSWARP.OUTPUT                OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   FPA        TRUE      NONE
+PSWARP.OUTPUT.MASK           OUTPUT {OUTPUT}.mask.fits                MASK            COMP_MASK  FPA        TRUE      NONE
+PSWARP.OUTPUT.VARIANCE       OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE
+PSWARP.OUTPUT.SOURCES        OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      NONE
+PSWARP.BIN1                  OUTPUT {OUTPUT}.b1.fits                  IMAGE           NONE       FPA        TRUE      NONE
+PSWARP.BIN2                  OUTPUT {OUTPUT}.b2.fits                  IMAGE           NONE       FPA        TRUE      NONE
+PSWARP.CONFIG                OUTPUT {OUTPUT}.pswarp.mdc               TEXT            NONE       FPA        TRUE      NONE
+                                                                                                              
+SKYCELL.STATS                OUTPUT {OUTPUT}.stats                    STATS           NONE       FPA        TRUE      NONE
+SKYCELL.TEMPLATE             OUTPUT {OUTPUT}.skycell                  SKYCELL         NONE       FPA        TRUE      NONE
+                                                                                                              
+PPSUB.OUTPUT                 OUTPUT {OUTPUT}.fits                     IMAGE           COMP_SUB   FPA        TRUE      NONE
+PPSUB.OUTPUT.MASK            OUTPUT {OUTPUT}.mask.fits                MASK            COMP_MASK  FPA        TRUE      NONE
+PPSUB.OUTPUT.VARIANCE        OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSUB.OUTPUT.SOURCES         OUTPUT {OUTPUT}.cmf                      CMF             NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.KERNELS         OUTPUT {OUTPUT}.subkernel                SUBKERNEL       NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.JPEG1           OUTPUT {OUTPUT}.b1.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.JPEG2           OUTPUT {OUTPUT}.b2.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPSUB.OUTPUT.RESID.JPEG      OUTPUT {OUTPUT}.res.jpg                  JPEG            NONE       FPA        TRUE      NONE
+PPSUB.INVERSE                OUTPUT {OUTPUT}.inv.fits                 IMAGE           COMP_SUB   FPA        TRUE      NONE
+PPSUB.INVERSE.MASK           OUTPUT {OUTPUT}.inv.mask.fits            MASK            COMP_MASK  FPA        TRUE      NONE
+PPSUB.INVERSE.VARIANCE       OUTPUT {OUTPUT}.inv.wt.fits              VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSUB.INVERSE.SOURCES        OUTPUT {OUTPUT}.inv.cmf                  CMF             NONE       FPA        TRUE      NONE
+PPSUB.CONFIG                 OUTPUT {OUTPUT}.ppSub.mdc                TEXT            NONE       FPA        TRUE      NONE
+PPSUB.INPUT.CONV             OUTPUT {OUTPUT}.inConv.fits              IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSUB.INPUT.CONV.MASK        OUTPUT {OUTPUT}.inConv.mk.fits           MASK            COMP_MASK  FPA        TRUE      NONE
+PPSUB.INPUT.CONV.VARIANCE    OUTPUT {OUTPUT}.inConv.wt.fits           VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSUB.REF.CONV               OUTPUT {OUTPUT}.refConv.fits             IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSUB.REF.CONV.MASK          OUTPUT {OUTPUT}.refConv.mk.fits          MASK            COMP_MASK  FPA        TRUE      NONE
+PPSUB.REF.CONV.VARIANCE      OUTPUT {OUTPUT}.refConv.wt.fits          VARIANCE        COMP_WT    FPA        TRUE      NONE
+                                                                                                      
+PPSTACK.OUTPUT               OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTACK.OUTPUT.MASK          OUTPUT {OUTPUT}.mask.fits                MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTACK.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXP           OUTPUT {OUTPUT}.exp.fits                 IMAGE           EXP        FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPNUM        OUTPUT {OUTPUT}.num.fits                 MASK            EXPNUM     FPA        TRUE      NONE
+PPSTACK.OUTPUT.EXPWT         OUTPUT {OUTPUT}.expwt.fits               VARIANCE        EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV               OUTPUT {OUTPUT}.unconv.fits              IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTACK.UNCONV.MASK          OUTPUT {OUTPUT}.unconv.mask.fits         MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTACK.UNCONV.VARIANCE      OUTPUT {OUTPUT}.unconv.wt.fits           VARIANCE        COMP_WT    FPA        TRUE      NONE
+PPSTACK.UNCONV.EXP           OUTPUT {OUTPUT}.unconv.exp.fits          IMAGE           EXP        FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPNUM        OUTPUT {OUTPUT}.unconv.num.fits          MASK            EXPNUM     FPA        TRUE      NONE
+PPSTACK.UNCONV.EXPWT         OUTPUT {OUTPUT}.unconv.expwt.fits        VARIANCE        EXP        FPA        TRUE      NONE
+PPSTACK.TARGET.PSF           OUTPUT {OUTPUT}.target.psf               PSF             NONE       CHIP       TRUE      NONE
+PPSTACK.CONV.KERNEL          OUTPUT {OUTPUT}.{FILE.INDEX}.kernel      SUBKERNEL       NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.JPEG1         OUTPUT {OUTPUT}.b1.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.JPEG2         OUTPUT {OUTPUT}.b2.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.CONFIG               OUTPUT {OUTPUT}.ppStack.mdc              TEXT            NONE       FPA        TRUE      NONE
+
+PPSTAMP.OUTPUT               OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   FPA        TRUE      NONE
+PPSTAMP.OUTPUT.MASK          OUTPUT {OUTPUT}.mk.fits                  MASK            COMP_MASK  FPA        TRUE      NONE
+PPSTAMP.OUTPUT.VARIANCE      OUTPUT {OUTPUT}.wt.fits                  VARIANCE        COMP_WT    FPA        TRUE      NONE
 # mosaic image used for making stamps of raw images. Not saved.
-PPSTAMP.CHIP            OUTPUT {OUTPUT}.ch.fits                  IMAGE     NONE       CHIP       FALSE     MEF
-PPSTAMP.OUTPUT.JPEG1    OUTPUT {OUTPUT}.jpg                      JPEG      NONE       FPA        TRUE      NONE
-		        									        
-PPSIM.OUTPUT            OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      SPLIT
-PPSIM.FAKE.CHIP        	OUTPUT {OUTPUT}.{CHIP.NAME}.fake.fits    IMAGE     NONE       CHIP       TRUE      NONE
-PPSIM.FORCE.CHIP       	OUTPUT {OUTPUT}.{CHIP.NAME}.force.fits   IMAGE     NONE       CHIP       TRUE      NONE
-PPSIM.SOURCES           OUTPUT {OUTPUT}.{CHIP.NAME}.cmf          CMF       NONE       CHIP       TRUE      NONE
-PPSIM.FAKE.SOURCES     	OUTPUT {OUTPUT}.{CHIP.NAME}.fake.cmf     CMF       NONE       CHIP       TRUE      NONE
-PPSIM.FORCE.SOURCES    	OUTPUT {OUTPUT}.{CHIP.NAME}.force.cmf    CMF       NONE       CHIP       TRUE      NONE
-
-PPARITH.OUTPUT.IMAGE   	OUTPUT {OUTPUT}.fits                     IMAGE     COMP_IMG   CHIP       TRUE      NONE
-PPARITH.OUTPUT.MASK    	OUTPUT {OUTPUT}.fits                     MASK      COMP_MASK  CHIP       TRUE      NONE
-		       										        
-PPSKYCELL.JPEG1    	OUTPUT {OUTPUT}.{FILE.INDEX}.b1.jpeg     JPEG      NONE       CHIP       TRUE      NONE
-PPSKYCELL.JPEG2    	OUTPUT {OUTPUT}.{FILE.INDEX}.b2.jpeg     JPEG      NONE       CHIP       TRUE      NONE
-
-LOG.IMFILE             	OUTPUT {OUTPUT}.{CHIP.NAME}.log          TEXT      NONE       CHIP       TRUE      NONE
-LOG.EXP                	OUTPUT {OUTPUT}.log                      TEXT      NONE       FPA        TRUE      NONE
-		       										        
-TRACE.IMFILE           	OUTPUT {OUTPUT}.{CHIP.NAME}.trace        TEXT      NONE       CHIP       TRUE      NONE
-TRACE.EXP              	OUTPUT {OUTPUT}.trace                    TEXT      NONE       FPA        TRUE      NONE
-
-PPNOISEMAP.OUTPUT       OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-
-CENSOR.OUTPUT           OUTPUT {OUTPUT}.smf                      CMF       NONE       FPA        TRUE      MEF
-
-MAGIC.ORIGINAL.PNG      OUTPUT {OUTPUT}_original.png             JPEG      NONE       FPA        TRUE      NONE
-MAGIC.RESIDUAL.PNG      OUTPUT {OUTPUT}_residual.png             JPEG      NONE       FPA        TRUE      NONE
-MAGIC.MASK.PNG          OUTPUT {OUTPUT}_mask.png                 JPEG      NONE       FPA        TRUE      NONE
-MAGIC.DUPLICATE.PNG     OUTPUT {OUTPUT}_duplicate.png            JPEG      NONE       FPA        TRUE      NONE
-
-PPSMOOTH.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits        IMAGE     NONE       CHIP       TRUE      MEF
-PPSMOOTH.OUTPUT.MASK     OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits     MASK      NONE       CHIP       TRUE      MEF
-PPSMOOTH.OUTPUT.VARIANCE OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits     VARIANCE  NONE       CHIP       TRUE      MEF
-
-PPBGRESTORE.OUTPUT      OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPBGRESTORE.BACKGROUND  OUTPUT {OUTPUT}.{CHIP.NAME}.bg.fits      IMAGE     NONE       CHIP       FALSE      NONE
-
-PPVIZPSF.OUTPUT		OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP       TRUE      NONE
-PPVIZPATTERN.OUTPUT	OUTPUT {OUTPUT}.{CHIP.NAME}.fits	 IMAGE	   NONE	      CHIP	 TRUE	   NONE
-PPVIZPATTERN.CHIP	OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits	 IMAGE	   NONE	      CHIP	 TRUE	   NONE
-
+PPSTAMP.CHIP                 OUTPUT {OUTPUT}.ch.fits                  IMAGE           NONE       CHIP       FALSE     MEF
+PPSTAMP.OUTPUT.JPEG1         OUTPUT {OUTPUT}.jpg                      JPEG            NONE       FPA        TRUE      NONE
+                                                                                                              
+PPSIM.OUTPUT                 OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      SPLIT
+PPSIM.FAKE.CHIP              OUTPUT {OUTPUT}.{CHIP.NAME}.fake.fits    IMAGE           NONE       CHIP       TRUE      NONE
+PPSIM.FORCE.CHIP             OUTPUT {OUTPUT}.{CHIP.NAME}.force.fits   IMAGE           NONE       CHIP       TRUE      NONE
+PPSIM.SOURCES                OUTPUT {OUTPUT}.{CHIP.NAME}.cmf          CMF             NONE       CHIP       TRUE      NONE
+PPSIM.FAKE.SOURCES           OUTPUT {OUTPUT}.{CHIP.NAME}.fake.cmf     CMF             NONE       CHIP       TRUE      NONE
+PPSIM.FORCE.SOURCES          OUTPUT {OUTPUT}.{CHIP.NAME}.force.cmf    CMF             NONE       CHIP       TRUE      NONE
+
+PPARITH.OUTPUT.IMAGE         OUTPUT {OUTPUT}.fits                     IMAGE           COMP_IMG   CHIP       TRUE      NONE
+PPARITH.OUTPUT.MASK          OUTPUT {OUTPUT}.fits                     MASK            COMP_MASK  CHIP       TRUE      NONE
+                                                                                                        
+PPSKYCELL.JPEG1              OUTPUT {OUTPUT}.{FILE.INDEX}.b1.jpeg     JPEG            NONE       CHIP       TRUE      NONE
+PPSKYCELL.JPEG2              OUTPUT {OUTPUT}.{FILE.INDEX}.b2.jpeg     JPEG            NONE       CHIP       TRUE      NONE
+
+LOG.IMFILE                   OUTPUT {OUTPUT}.{CHIP.NAME}.log          TEXT            NONE       CHIP       TRUE      NONE
+LOG.EXP                      OUTPUT {OUTPUT}.log                      TEXT            NONE       FPA        TRUE      NONE
+                                                                                                              
+TRACE.IMFILE                 OUTPUT {OUTPUT}.{CHIP.NAME}.trace        TEXT            NONE       CHIP       TRUE      NONE
+TRACE.EXP                    OUTPUT {OUTPUT}.trace                    TEXT            NONE       FPA        TRUE      NONE
+
+PPNOISEMAP.OUTPUT            OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+
+CENSOR.OUTPUT                OUTPUT {OUTPUT}.smf                      CMF             NONE       FPA        TRUE      MEF
+
+MAGIC.ORIGINAL.PNG           OUTPUT {OUTPUT}_original.png             JPEG            NONE       FPA        TRUE      NONE
+MAGIC.RESIDUAL.PNG           OUTPUT {OUTPUT}_residual.png             JPEG            NONE       FPA        TRUE      NONE
+MAGIC.MASK.PNG               OUTPUT {OUTPUT}_mask.png                 JPEG            NONE       FPA        TRUE      NONE
+MAGIC.DUPLICATE.PNG          OUTPUT {OUTPUT}_duplicate.png            JPEG            NONE       FPA        TRUE      NONE
+
+PPSMOOTH.OUTPUT              OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      MEF
+PPSMOOTH.OUTPUT.MASK         OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK            NONE       CHIP       TRUE      MEF
+PPSMOOTH.OUTPUT.VARIANCE     OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits      VARIANCE        NONE       CHIP       TRUE      MEF
+
+PPBGRESTORE.OUTPUT           OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPBGRESTORE.BACKGROUND       OUTPUT {OUTPUT}.{CHIP.NAME}.bg.fits      IMAGE           NONE       CHIP       FALSE     NONE
+
+PPVIZPSF.OUTPUT              OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPVIZPATTERN.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE           NONE       CHIP       TRUE      NONE
+PPVIZPATTERN.CHIP            OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE           NONE       CHIP       TRUE      NONE
+
+
+# FILERULE naming operators:
 # {FPA.OBS}
 # {FPA.NAME}
Index: branches/czw_branch/20100427/ippconfig/recipes/nightly_science.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/nightly_science.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/nightly_science.config	(revision 28017)
@@ -1,3 +1,20 @@
 RETENTION_TIME   U16	9000
+
+CLEAN_MODES MULTI
+CLEAN_MODES METADATA
+  MODE STR CHIP
+  COMMAND STR chiptool
+  RETENTION_TIME U16 30
+END
+CLEAN_MODES METADATA
+  MODE STR WARP
+  COMMAND STR warptool
+  RETENTION_TIME U16 7
+END
+CLEAN_MODES METADATA
+  MODE STR DIFF
+  COMMAND STR difftool
+  RETENTION_TIME U16 30
+END
 
 FILTERS MULTI
@@ -111,4 +128,5 @@
 # OBJECT STR SS
   STACKABLE BOOL FALSE
+  NOCLEAN BOOL TRUE
 END
 TARGETS METADATA
@@ -132,5 +150,5 @@
   OBJECT STR MD01%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -147,5 +165,5 @@
   OBJECT STR MD02%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -162,5 +180,5 @@
   OBJECT STR MD03%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -177,5 +195,5 @@
   OBJECT STR MD04%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -192,5 +210,5 @@
   OBJECT STR MD05%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -207,5 +225,5 @@
   OBJECT STR MD06%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -222,5 +240,5 @@
   OBJECT STR MD07%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -237,5 +255,5 @@
   OBJECT STR MD08%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -252,5 +270,5 @@
   OBJECT STR MD09%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
+  REDUCTION STR MICROTEST_NOPATTERN
   STACKABLE BOOL TRUE
 END
@@ -267,5 +285,5 @@
   OBJECT STR MD10%
   COMMENT STR Microtest Obs%
-  REDUCTION STR STDSCIENCE.V0
-  STACKABLE BOOL TRUE
-END
+  REDUCTION STR MICROTEST_NOPATTERN
+  STACKABLE BOOL TRUE
+END
Index: branches/czw_branch/20100427/ippconfig/recipes/ppImage.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/ppImage.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppImage.config	(revision 28017)
@@ -35,5 +35,5 @@
 USE.BEST.BURNTOOL  BOOL    FALSE           # require the best burntooled data
 TILTYSTREAK.APPLY  BOOL    FALSE           # apply the 'tiltystreak' tool
-
+MASK.STATS         BOOL    FALSE           # calculate mask statistics.
 GAIN.OVERRIDE		BOOL	TRUE		# Override a non-finite gain?
 
@@ -67,4 +67,9 @@
 # Which regions identified by burntool to mask. 0x01 : only unfit trails, 0x02 "up" trails, 0x04 "down" trails
 BURNTOOL.TRAILS     U16 0x07
+
+MASKSTAT.STATIC     U32 0x01f
+MASKSTAT.DYNAMIC    U32 0x060
+MASKSTAT.MAGIC      U32 0x800
+MASKSTAT.ADVISORY   U32 0x080
 
 # Non-linearity correction
@@ -169,4 +174,5 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
 END
 
@@ -1822,4 +1828,5 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    FALSE           # Subtract background?
+  MASK.STATS         BOOL    TRUE	     # Calculate Mask statistics
 END
 
@@ -1846,4 +1853,5 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE	     # Calculate Mask statistics
 END
 
@@ -1870,4 +1878,5 @@
   ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
   BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE	     # Calculate Mask statistics
   PATTERN.ROW      BOOL    TRUE           # Subtract pattern noise
   PATTERN.CELL     BOOL    FALSE           # Subtract pattern noise
Index: branches/czw_branch/20100427/ippconfig/recipes/ppSim.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/ppSim.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppSim.config	(revision 28017)
@@ -53,5 +53,5 @@
 STARS.MAG	F32	15.5		# Brightest magnitude for fake stars (choose based on real catalog limit)
 STARS.DENSITY	F32      1.0		# Stellar density (per square degree) at the brightest magnitude
-STARS.SIGMA.LIM F32      0.1            # significance of faintest sources
+STARS.SIGMA.LIM F32      1.0            # significance of faintest sources
 
 STARS.FLAT.LUM  BOOL    FALSE           # use a (non-physical) constant number of stars per mag bin?
Index: branches/czw_branch/20100427/ippconfig/recipes/ppStack.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/ppStack.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppStack.config	(revision 28017)
@@ -61,4 +61,5 @@
 	z	F32	0.0
 	y	F32	0.0
+	w	F32	0.0
 END
 ZP.TARGET	METADATA		# Target zero point by filter
@@ -68,4 +69,5 @@
 	z	F32	25.0
 	y	F32	25.0
+	w	F32	25.0
 END
 
Index: branches/czw_branch/20100427/ippconfig/recipes/ppStats.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/ppStats.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppStats.config	(revision 28017)
@@ -100,9 +100,10 @@
   ANALYSIS	STR	DETREND
 
-#  ANALYSIS 	STR	MASKFRAC_STATIC
-#  ANALYSIS 	STR	MASKFRAC_MAGIC
-#  ANALYSIS	STR	MASKFRAC_ADVISORY
-#  ANALYSIS	STR	MASKFRAC_DYNAMIC
-#  ANALYSIS	STR	MASKFRAC_NPIX
+  SUMMARY 	STR	MASKFRAC_STATIC
+  SUMMARY	STR	MASKFRAC_MAGIC
+  SUMMARY	STR	MASKFRAC_ADVISORY
+  SUMMARY	STR	MASKFRAC_DYNAMIC
+  SUMMARY	STR	MASKFRAC_NPIX
+
 END
 
Index: branches/czw_branch/20100427/ippconfig/recipes/ppStatsFromMetadata.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/ppStatsFromMetadata.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppStatsFromMetadata.config	(revision 28017)
@@ -180,4 +180,11 @@
   ENTRY	 VAL  IMAGE_V		  STR  CONSTANT		-ver_ppimage
   ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
+  
+  # Mask stats values
+  ENTRY VAL MASKFRAC_NPIX	  S32  CONSTANT		-maskfrac_npix
+  ENTRY VAL MASKFRAC_STATIC	  F32  CONSTANT		-maskfrac_static
+  ENTRY VAL MASKFRAC_DYNAMIC	  F32  CONSTANT		-maskfrac_dynamic
+  ENTRY VAL MASKFRAC_MAGIC	  F32  CONSTANT		-maskfrac_magic
+  ENTRY VAL MASKFRAC_ADVISORY	  F32  CONSTANT		-maskfrac_advisory
 END
 
@@ -273,4 +280,11 @@
   ENTRY	 VAL  IMAGE_V		  STR  CONSTANT		-ver_ppimage
   ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
+
+  # Mask stats values
+  ENTRY VAL MASKFRAC_NPIX	  S32  CONSTANT		-maskfrac_npix
+  ENTRY VAL MASKFRAC_STATIC	  F32  CONSTANT		-maskfrac_static
+  ENTRY VAL MASKFRAC_DYNAMIC	  F32  CONSTANT		-maskfrac_dynamic
+  ENTRY VAL MASKFRAC_MAGIC	  F32  CONSTANT		-maskfrac_magic
+  ENTRY VAL MASKFRAC_ADVISORY	  F32  CONSTANT		-maskfrac_advisory
 END
 
@@ -296,4 +310,12 @@
   ENTRY	 VAL  WARP_V		  STR  CONSTANT		-ver_pswarp
   ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
+
+  # Mask stats values
+  ENTRY VAL MASKFRAC_NPIX	  S32  CONSTANT		-maskfrac_npix
+  ENTRY VAL MASKFRAC_STATIC	  F32  CONSTANT		-maskfrac_static
+  ENTRY VAL MASKFRAC_DYNAMIC	  F32  CONSTANT		-maskfrac_dynamic
+  ENTRY VAL MASKFRAC_MAGIC	  F32  CONSTANT		-maskfrac_magic
+  ENTRY VAL MASKFRAC_ADVISORY	  F32  CONSTANT		-maskfrac_advisory
+
 END
 
@@ -363,4 +385,11 @@
   ENTRY	 VAL  PPSUB_V		  STR  CONSTANT		-ver_ppsub	
   ENTRY	 VAL  STREAK_V		  STR  CONSTANT		-ver_streaks
+
+  # Mask stats values
+  ENTRY VAL MASKFRAC_NPIX	  S32  CONSTANT		-maskfrac_npix
+  ENTRY VAL MASKFRAC_STATIC	  F32  CONSTANT		-maskfrac_static
+  ENTRY VAL MASKFRAC_DYNAMIC	  F32  CONSTANT		-maskfrac_dynamic
+  ENTRY VAL MASKFRAC_MAGIC	  F32  CONSTANT		-maskfrac_magic
+  ENTRY VAL MASKFRAC_ADVISORY	  F32  CONSTANT		-maskfrac_advisory
 END
 
Index: branches/czw_branch/20100427/ippconfig/recipes/ppSub.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/ppSub.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/ppSub.config	(revision 28017)
@@ -21,4 +21,11 @@
 MASK.BAD        STR	CONV.BAD	# Mask value to give bad pixels
 MASK.POOR       STR	CONV.POOR	# Mask value to give poor pixels
+
+MASK.STATS         BOOL    TRUE            # calculate mask statistics.
+MASKSTAT.STATIC     U32 0x01f
+MASKSTAT.DYNAMIC    U32 0x060
+MASKSTAT.MAGIC      U32 0x800
+MASKSTAT.ADVISORY   U32 0x080
+
 
 LOW.THRESHOLD	F32	4.0	        # Mask pixels below this threshold (std dev)
Index: branches/czw_branch/20100427/ippconfig/recipes/psastro.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/psastro.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/psastro.config	(revision 28017)
@@ -163,4 +163,12 @@
 EXTRACT_MAX_MAG                 F32 -15.0
 
+MASK.STATS          BOOL TRUE
+MASKSTAT.STATIC     U32 0x01f
+MASKSTAT.DYNAMIC    U32 0x060
+MASKSTAT.MAGIC      U32 0x800
+MASKSTAT.ADVISORY   U32 0x080
+
+
+
 # 2MASS default configuration (use 2MASS_J as ref magnitude)
 PSASTRO.CATDIR                STR      2MASS
Index: branches/czw_branch/20100427/ippconfig/recipes/psphot.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/psphot.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/psphot.config	(revision 28017)
@@ -151,4 +151,5 @@
 EXTENDED_SOURCE_ANALYSIS            BOOL  FALSE  # perform any of the aperture-like measurements?
 EXTENDED_SOURCE_SN_LIM              F32   20.0
+EXTENDED_SOURCE_RAW_RADIUS          BOOL  FALSE
 EXTENDED_SOURCE_PETROSIAN           BOOL  FALSE
 EXTENDED_SOURCE_ISOPHOTAL           BOOL  FALSE
@@ -174,6 +175,10 @@
 
 # define the annuli (in pixels) for surface brightness measurements
-@RADIAL.ANNULAR.BINS.LOWER           F32     0.0   5.0  10.0  20.0  40.0  80.0
-@RADIAL.ANNULAR.BINS.UPPER           F32     5.0  10.0  20.0  40.0  80.0 160.0
+# @RADIAL.ANNULAR.BINS.LOWER           F32     0.0   5.0  10.0  20.0  40.0  80.0
+# @RADIAL.ANNULAR.BINS.UPPER           F32     5.0  10.0  20.0  40.0  80.0 160.0
+
+# SDSS values:
+@RADIAL.ANNULAR.BINS.LOWER           F32     0.00 0.56 1.69 2.59 4.41  7.51 11.58 18.58 28.55 45.50  70.51 110.53 172.49 269.52 420.51
+@RADIAL.ANNULAR.BINS.UPPER           F32     0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 652.50
 
 # Extended source fit parameters
@@ -279,5 +284,41 @@
 
 # stack photometry parameters
-PSPHOT.STACK.MATCH.RADIUS           F32   1.0 # join detections from different images with this correlation radius (pixels)
+PSPHOT.STACK.MATCH.RADIUS           F32   1.0  # join detections from different images with this correlation radius (pixels)
+PSPHOT.STACK.MATCH.PSF              BOOL  T    # convolved input images to common target PSF
+PSPHOT.STACK.MATCH.PSF.SOURCE       STR   AUTO # which inputs to convolve? (RAW, CNV, AUTO)
+PSPHOT.STACK.TARGET.PSF.AUTO        BOOL  T    # automatically determine target PSF size?
+PSPHOT.STACK.TARGET.PSF.FWHM        F32   5.0  # FWHM of target PSF (if NOT AUTO sized; pixels)
+
+RADIAL_APERTURES                    BOOL  F    # calculate flux in circular radial apertures?
+RADIAL_APERTURES_SN_LIM             F32   0.0  # S/N limit for radial aperture calculation
+
+# Extended source fit parameters
+STACKPHOT_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  FALSE
+  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+  EXTENDED_SOURCE_KRON                BOOL  FALSE
+  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?
+  PSPHOT.STACK.TARGET.PSF.FWHM        F32   4.5  # FWHM of target PSF (if NOT AUTO sized; pixels)
+END
+
+# Extended source fit parameters
+STACKPHOT                             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  FALSE
+  EXTENDED_SOURCE_ANNULI              BOOL  TRUE
+  EXTENDED_SOURCE_KRON                BOOL  FALSE
+  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?
+  PSPHOT.STACK.TARGET.PSF.FWHM        F32   7.5  # FWHM of target PSF (if NOT AUTO sized; pixels)
+  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
+END
 
 # Recipe overrides for CHIP
Index: branches/czw_branch/20100427/ippconfig/recipes/pswarp.config
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/pswarp.config	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/pswarp.config	(revision 28017)
@@ -12,4 +12,11 @@
 PSF			BOOL	TRUE		# Measure PSF for warped image?
 
+MASK.STATS         BOOL    TRUE            # calculate mask statistics.
+MASKSTAT.STATIC     U32 0x01f
+MASKSTAT.DYNAMIC    U32 0x060
+MASKSTAT.MAGIC      U32 0x800
+MASKSTAT.ADVISORY   U32 0x080
+
+
 # Default recipe for warping
 WARP	METADATA
Index: branches/czw_branch/20100427/ippconfig/recipes/reductionClasses.mdc
===================================================================
--- branches/czw_branch/20100427/ippconfig/recipes/reductionClasses.mdc	(revision 27784)
+++ branches/czw_branch/20100427/ippconfig/recipes/reductionClasses.mdc	(revision 28017)
@@ -157,4 +157,5 @@
 	ADDSTAR		STR	ADDSTAR
 	PSASTRO		STR	DEFAULT_RECIPE
+	STACKPHOT       STR     STACKPHOT
 END
 
@@ -178,4 +179,21 @@
 # basic science analysis
 MAGICTEST.V0		METADATA
+	CHIP_PPIMAGE	STR	CHIP_NOPATTERN
+	CHIP_PSPHOT	STR	CHIP
+	WARP_PSWARP	STR	WARP
+	STACK_PPSTACK	STR	STACK
+	STACK_PPSUB	STR	STACK
+	STACK_PSPHOT	STR	STACK
+	DIFF_PPSUB	STR	DIFF
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+	FAKEPHOT	STR	FAKEPHOT
+	ADDSTAR		STR	ADDSTAR
+	PSASTRO		STR	DEFAULT_RECIPE
+END
+
+# microtest no pattern reduction class
+MICROTEST_NOPATTERN		METADATA
 	CHIP_PPIMAGE	STR	CHIP_NOPATTERN
 	CHIP_PSPHOT	STR	CHIP
