Index: /branches/eam_branch_20080408/ippconfig/cfh12k/camera.config
===================================================================
--- /branches/eam_branch_20080408/ippconfig/cfh12k/camera.config	(revision 17477)
+++ /branches/eam_branch_20080408/ippconfig/cfh12k/camera.config	(revision 17478)
@@ -284,5 +284,5 @@
 END
 
-FILERULES	STR	cfh12k/filerules-mef.mdc		# File rules appropriate for MEF format
+FILERULES	STR	recipes/filerules-mef.mdc		# File rules appropriate for MEF format
 
 EXTNAME.RULES METADATA
Index: /branches/eam_branch_20080408/ippconfig/esowfi/camera.config
===================================================================
--- /branches/eam_branch_20080408/ippconfig/esowfi/camera.config	(revision 17477)
+++ /branches/eam_branch_20080408/ippconfig/esowfi/camera.config	(revision 17478)
@@ -221,5 +221,5 @@
 END
 
-FILERULES	STR	esowfi/filerules-mef.mdc		# File rules appropriate for MEF format
+FILERULES	STR	recipes/filerules-mef.mdc		# File rules appropriate for MEF format
 
 # FPA file defines properties of a possible input|output object
Index: /branches/eam_branch_20080408/ippconfig/megacam/camera.config
===================================================================
--- /branches/eam_branch_20080408/ippconfig/megacam/camera.config	(revision 17477)
+++ /branches/eam_branch_20080408/ippconfig/megacam/camera.config	(revision 17478)
@@ -312,5 +312,5 @@
 END
 
-FILERULES	STR	megacam/filerules-mef.mdc		# File rules appropriate for MEF format
+FILERULES	STR	recipes/filerules-mef.mdc		# File rules appropriate for MEF format
 
 EXTNAME.RULES METADATA
Index: /branches/eam_branch_20080408/ippconfig/megacam/filerules-mef.mdc
===================================================================
--- /branches/eam_branch_20080408/ippconfig/megacam/filerules-mef.mdc	(revision 17477)
+++ /branches/eam_branch_20080408/ippconfig/megacam/filerules-mef.mdc	(revision 17478)
@@ -1,5 +1,5 @@
 ### File rules for PHU=FPA, EXT=CHIP
 
-### Redirections
+### Redirections (MEF)
 PPIMAGE.OUTPUT        STR PPIMAGE.OUTPUT.MEF
 PPIMAGE.OUTPUT.MASK   STR PPIMAGE.OUT.MK.MEF
@@ -10,16 +10,32 @@
 PPIMAGE.CHIP.WEIGHT   STR PPIMAGE.CHIP.WT.MEF
 
+PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
+PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
+
+PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.MEF
+PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.MEF
+
+### Redirections (SPL)
+# PPIMAGE.OUTPUT        STR PPIMAGE.OUTPUT.SPL
+# PPIMAGE.OUTPUT.MASK   STR PPIMAGE.OUT.MK.SPL
+# PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.SPL
+# 
+# PPIMAGE.CHIP          STR PPIMAGE.CHIP.SPL
+# PPIMAGE.CHIP.MASK     STR PPIMAGE.CHIP.MK.SPL
+# PPIMAGE.CHIP.WEIGHT   STR PPIMAGE.CHIP.WT.SPL
+# 
+# PPIMAGE.BIN1          STR PPIMAGE.BIN1.SPL
+# PPIMAGE.BIN2          STR PPIMAGE.BIN2.SPL
+# 
+# PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.SPL
+# PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.SPL
+
+### Redirections (common)
+
 PPIMAGE.OUTPUT.FPA1   STR PPIMAGE.OUTPUT.FPA1.MEF
 PPIMAGE.OUTPUT.FPA2   STR PPIMAGE.OUTPUT.FPA2.MEF
-PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
-PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
-
 PPSTAMP.CHIP          STR PPSTAMP.CHIP.MEF
-
 PSASTRO.INPUT         STR PSASTRO.INPUT.CMF
-PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.MEF
 PSASTRO.OUTPUT.MEF    STR PSASTRO.OUT.CMF.MEF
-PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.MEF
-
 DVOCORR.OUTPUT        STR DVOCORR.MEF.OUTPUT
 DVOFLAT.OUTPUT        STR DVOFLAT.MEF.OUTPUT
Index: /branches/eam_branch_20080408/ippconfig/mosaic2/camera.config
===================================================================
--- /branches/eam_branch_20080408/ippconfig/mosaic2/camera.config	(revision 17477)
+++ /branches/eam_branch_20080408/ippconfig/mosaic2/camera.config	(revision 17478)
@@ -260,7 +260,6 @@
 END
 
-# Set file rules appropriate for mef format in separate file
-# (this is SR's local copy)
-FILERULES   STR   mosaic2/filerules-mef.mdc 
+# Set file rules appropriate for mef format (common to all mef cameras)
+FILERULES   STR   recipes/filerules-mef.mdc 
 
 EXTNAME.RULES METADATA
Index: /branches/eam_branch_20080408/ippconfig/mosaic2/filerules-mef.mdc
===================================================================
--- /branches/eam_branch_20080408/ippconfig/mosaic2/filerules-mef.mdc	(revision 17477)
+++ /branches/eam_branch_20080408/ippconfig/mosaic2/filerules-mef.mdc	(revision 17478)
@@ -1,20 +1,41 @@
 ### File rules for PHU=FPA, EXT=CHIP
-### Redirections
+
+### Redirections (MEF)
 PPIMAGE.OUTPUT        STR PPIMAGE.OUTPUT.MEF
 PPIMAGE.OUTPUT.MASK   STR PPIMAGE.OUT.MK.MEF
 PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF
+
 PPIMAGE.CHIP          STR PPIMAGE.CHIP.MEF
 PPIMAGE.CHIP.MASK     STR PPIMAGE.CHIP.MK.MEF
 PPIMAGE.CHIP.WEIGHT   STR PPIMAGE.CHIP.WT.MEF
+
+PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
+PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
+
+PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.MEF
+PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.MEF
+
+### Redirections (SPL)
+# PPIMAGE.OUTPUT        STR PPIMAGE.OUTPUT.SPL
+# PPIMAGE.OUTPUT.MASK   STR PPIMAGE.OUT.MK.SPL
+# PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.SPL
+# 
+# PPIMAGE.CHIP          STR PPIMAGE.CHIP.SPL
+# PPIMAGE.CHIP.MASK     STR PPIMAGE.CHIP.MK.SPL
+# PPIMAGE.CHIP.WEIGHT   STR PPIMAGE.CHIP.WT.SPL
+# 
+# PPIMAGE.BIN1          STR PPIMAGE.BIN1.SPL
+# PPIMAGE.BIN2          STR PPIMAGE.BIN2.SPL
+# 
+# PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.SPL
+# PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.SPL
+
+### Redirections (common)
+
 PPIMAGE.OUTPUT.FPA1   STR PPIMAGE.OUTPUT.FPA1.MEF
 PPIMAGE.OUTPUT.FPA2   STR PPIMAGE.OUTPUT.FPA2.MEF
-PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
-PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
-
 PPSTAMP.CHIP          STR PPSTAMP.CHIP.MEF
 PSASTRO.INPUT         STR PSASTRO.INPUT.CMF
-PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.MEF
 PSASTRO.OUTPUT.MEF    STR PSASTRO.OUT.CMF.MEF
-PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.MEF
 DVOCORR.OUTPUT        STR DVOCORR.MEF.OUTPUT
 DVOFLAT.OUTPUT        STR DVOFLAT.MEF.OUTPUT
@@ -35,4 +56,9 @@
 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.WEIGHT INPUT @FILES      CHIP       WEIGHT
+
 ## files used to build and apply the flat-field correction images
 DVOCORR.INPUT      INPUT @FILES        CHIP       IMAGE
@@ -50,4 +76,6 @@
 
 ## files used by psastro 
+PSASTRO.WCS        INPUT none.fits     CHIP       CMF
+PSASTRO.MODEL      INPUT @DETDB        FPA        ASTROM
 PSASTRO.INPUT.CMP  INPUT @FILES        CHIP       CMP
 PSASTRO.INPUT.CMF  INPUT @FILES        CHIP       CMF
@@ -71,4 +99,5 @@
 PPSTACK.INPUT.MASK INPUT @FILES        FPA        MASK
 PPSTACK.INPUT.WEIGHT INPUT @FILES      FPA        WEIGHT
+PPSTACK.INPUT.PSF  INPUT @FILES        CHIP       PSF
 PPSTACK.SOURCES    INPUT @FILES        FPA        CMF
 
@@ -81,5 +110,4 @@
 TYPE                  OUTPUT FILENAME.RULE                    FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT
 
-PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.detmask.fits	      IMAGE     COMP_MASK CHIP       TRUE      MEF
 PPIMAGE.OUTPUT.MEF    OUTPUT {OUTPUT}.b0.fits                 IMAGE     COMP_IMG  CHIP       TRUE      MEF
 PPIMAGE.OUT.MK.MEF    OUTPUT {OUTPUT}.mk.fits                 MASK      COMP_MASK CHIP       TRUE      MEF
@@ -88,4 +116,5 @@
 PPIMAGE.OUT.MK.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits     MASK      NONE      CHIP       TRUE      SPLIT
 PPIMAGE.OUT.WT.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits     WEIGHT    NONE      CHIP       TRUE      SPLIT
+PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits                   IMAGE     MASK      CHIP       TRUE      MEF
 
 PPIMAGE.CHIP.MEF      OUTPUT {OUTPUT}.ch.fits                 IMAGE     COMP_IMG  CHIP       TRUE      MEF
@@ -98,6 +127,6 @@
 PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits               IMAGE     COMP_IMG  FPA        TRUE      MEF
 PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits               IMAGE     COMP_IMG  FPA        TRUE      MEF
-PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   IMAGE     NONE      FPA        TRUE      SPLIT
-PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   IMAGE     NONE      FPA        TRUE      SPLIT
+PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   IMAGE     NONE      CHIP       TRUE      SPLIT
+PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   IMAGE     NONE      CHIP       TRUE      SPLIT
 
 PPIMAGE.STATS         OUTPUT {OUTPUT}.stats                   STATS     NONE      FPA        TRUE      MEF
@@ -111,5 +140,12 @@
 PPIMAGE.JPEG2         OUTPUT {OUTPUT}.b2.jpg                  JPEG      NONE      FPA        TRUE      NONE
 
-PPMERGE.OUTPUT        OUTPUT {OUTPUT}.fits                    IMAGE     NONE      FPA        TRUE      MEF
+PPMERGE.OUTPUT.MASK      OUTPUT {OUTPUT}.fits                 MASK      NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.BIAS      OUTPUT {OUTPUT}.fits                 IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.DARK      OUTPUT {OUTPUT}.fits                 DARK      NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.SHUTTER   OUTPUT {OUTPUT}.fits                 IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.FLAT      OUTPUT {OUTPUT}.fits                 IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.FRINGE    OUTPUT {OUTPUT}.fits                 FRINGE    NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.SIGMA     OUTPUT {OUTPUT}.sigma.fits           IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.COUNT     OUTPUT {OUTPUT}.count.fits           IMAGE     NONE      CHIP       TRUE      NONE
 
 DVOCORR.MEF.OUTPUT    OUTPUT {OUTPUT}.fc.fits                 IMAGE     NONE      CHIP       TRUE      MEF
@@ -118,17 +154,16 @@
 DVOFLAT.SPL.OUTPUT    OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits     IMAGE     NONE      CHIP       TRUE      SPLIT
 
-PSPHOT.RESID          OUTPUT {OUTPUT}.res.fits                IMAGE     NONE      CHIP       FALSE     NONE
-PSPHOT.BACKGND        OUTPUT {OUTPUT}.bck.fits                IMAGE     NONE      CHIP       FALSE     NONE
-PSPHOT.BACKSUB        OUTPUT {OUTPUT}.sub.fits                IMAGE     NONE      CHIP       FALSE     NONE
-PSPHOT.BACKMDL        OUTPUT {OUTPUT}.mdl.fits                IMAGE     NONE      CHIP       FALSE     NONE
+PSPHOT.RESID          OUTPUT {OUTPUT}.res.fits                IMAGE     NONE      CHIP       FALSE     MEF
+PSPHOT.BACKGND        OUTPUT {OUTPUT}.bck.fits                IMAGE     NONE      CHIP       FALSE     MEF
+PSPHOT.BACKSUB        OUTPUT {OUTPUT}.sub.fits                IMAGE     NONE      CHIP       FALSE     MEF
+PSPHOT.BACKMDL        OUTPUT {OUTPUT}.mdl.fits                IMAGE     NONE      CHIP       FALSE     MEF
 
 PSPHOT.OUTPUT.RAW     OUTPUT {OUTPUT}.{CHIP.NAME}             RAW       NONE      CHIP       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.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      SPLIT
-PSPHOT.OUT.CMF.MEF    OUTPUT {OUTPUT}.cmf                     CMF       NONE      CHIP       TRUE      NONE
-
-PSPHOT.PSF.SAVE       OUTPUT {OUTPUT}.psf                     PSF       NONE      CHIP       TRUE      NONE
+PSPHOT.OUT.CMF.MEF    OUTPUT {OUTPUT}.cmf                     CMF       NONE      CHIP       TRUE      MEF
+PSPHOT.PSF.SAVE       OUTPUT {OUTPUT}.psf                     PSF       NONE      CHIP       TRUE      MEF
 
 SOURCE.PLOT.MOMENTS   OUTPUT {OUTPUT}.mnt.png                 KAPA      NONE      FPA        TRUE      NONE
@@ -137,7 +172,8 @@
 
 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      NONE
-PSASTRO.OUT.ASTROM    OUTPUT {OUTPUT}.ast                     ASTROM    NONE      FPA        TRUE      NONE
+PSASTRO.OUT.CMF.SPL   OUTPUT {OUTPUT}.{CHIP.NAME}.smf         CMF       NONE      CHIP       TRUE      SPLIT
+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
 
 PSWARP.OUTPUT         OUTPUT {OUTPUT}.fits                    IMAGE     COMP_IMG  FPA        TRUE      NONE
@@ -148,4 +184,7 @@
 PSWARP.BIN2           OUTPUT {OUTPUT}.b2.fits                 IMAGE     COMP_IMG  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_IMG  FPA        TRUE      NONE
 PPSUB.OUTPUT.MASK     OUTPUT {OUTPUT}.mk.fits                 MASK      COMP_MASK FPA        TRUE      NONE
@@ -159,5 +198,7 @@
 PPSTAMP.CHIP.MEF      OUTPUT {OUTPUT}.ch.fits                 IMAGE     NONE      CHIP       FALSE     MEF
 
-PPSIM.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits        IMAGE     NONE      CHIP       TRUE      SPLIT
+PPSIM.OUTPUT.MEF      OUTPUT {OUTPUT}.fits                    IMAGE     NONE      CHIP       TRUE      MEF
+PPSIM.OUTPUT.SPL      OUTPUT {OUTPUT}.{CHIP.NAME}.fits        IMAGE     NONE      CHIP       TRUE      SPLIT
+PPSIM.SOURCES         OUTPUT {OUTPUT}.cmf                     CMF       NONE      FPA        TRUE      MEF
 
 PPARITH.OUTPUT.IMAGE  OUTPUT {OUTPUT}.fits                    IMAGE     COMP_IMG  CHIP       TRUE      NONE
Index: /branches/eam_branch_20080408/ippconfig/recipes/filerules-mef.mdc
===================================================================
--- /branches/eam_branch_20080408/ippconfig/recipes/filerules-mef.mdc	(revision 17477)
+++ /branches/eam_branch_20080408/ippconfig/recipes/filerules-mef.mdc	(revision 17478)
@@ -1,5 +1,6 @@
 ### File rules for PHU=FPA, EXT=CHIP
-
-### Redirections
+### this file specifies compression types for various output files
+
+### Redirections (MEF)
 PPIMAGE.OUTPUT        STR PPIMAGE.OUTPUT.MEF
 PPIMAGE.OUTPUT.MASK   STR PPIMAGE.OUT.MK.MEF
@@ -10,16 +11,32 @@
 PPIMAGE.CHIP.WEIGHT   STR PPIMAGE.CHIP.WT.MEF
 
+PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
+PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
+
+PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.MEF
+PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.MEF
+
+### Redirections (SPL)
+# PPIMAGE.OUTPUT        STR PPIMAGE.OUTPUT.SPL
+# PPIMAGE.OUTPUT.MASK   STR PPIMAGE.OUT.MK.SPL
+# PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.SPL
+# 
+# PPIMAGE.CHIP          STR PPIMAGE.CHIP.SPL
+# PPIMAGE.CHIP.MASK     STR PPIMAGE.CHIP.MK.SPL
+# PPIMAGE.CHIP.WEIGHT   STR PPIMAGE.CHIP.WT.SPL
+# 
+# PPIMAGE.BIN1          STR PPIMAGE.BIN1.SPL
+# PPIMAGE.BIN2          STR PPIMAGE.BIN2.SPL
+# 
+# PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.SPL
+# PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.SPL
+
+### Redirections (common)
+
 PPIMAGE.OUTPUT.FPA1   STR PPIMAGE.OUTPUT.FPA1.MEF
 PPIMAGE.OUTPUT.FPA2   STR PPIMAGE.OUTPUT.FPA2.MEF
-PPIMAGE.BIN1          STR PPIMAGE.BIN1.MEF
-PPIMAGE.BIN2          STR PPIMAGE.BIN2.MEF
-
 PPSTAMP.CHIP          STR PPSTAMP.CHIP.MEF
-
 PSASTRO.INPUT         STR PSASTRO.INPUT.CMF
-PSASTRO.OUTPUT        STR PSASTRO.OUT.CMF.MEF
 PSASTRO.OUTPUT.MEF    STR PSASTRO.OUT.CMF.MEF
-PSPHOT.OUTPUT         STR PSPHOT.OUT.CMF.MEF
-
 DVOCORR.OUTPUT        STR DVOCORR.MEF.OUTPUT
 DVOFLAT.OUTPUT        STR DVOFLAT.MEF.OUTPUT
@@ -40,4 +57,9 @@
 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.WEIGHT INPUT @FILES      CHIP       WEIGHT
+
 ## files used to build and apply the flat-field correction images
 DVOCORR.INPUT      INPUT @FILES        CHIP       IMAGE
@@ -55,4 +77,6 @@
 
 ## files used by psastro 
+PSASTRO.WCS        INPUT none.fits     CHIP       CMF
+PSASTRO.MODEL      INPUT @DETDB        FPA        ASTROM
 PSASTRO.INPUT.CMP  INPUT @FILES        CHIP       CMP
 PSASTRO.INPUT.CMF  INPUT @FILES        CHIP       CMF
@@ -76,4 +100,5 @@
 PPSTACK.INPUT.MASK INPUT @FILES        FPA        MASK
 PPSTACK.INPUT.WEIGHT INPUT @FILES      FPA        WEIGHT
+PPSTACK.INPUT.PSF  INPUT @FILES        CHIP       PSF
 PPSTACK.SOURCES    INPUT @FILES        FPA        CMF
 
@@ -91,4 +116,5 @@
 PPIMAGE.OUT.MK.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits     MASK      NONE      CHIP       TRUE      SPLIT
 PPIMAGE.OUT.WT.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits     WEIGHT    NONE      CHIP       TRUE      SPLIT
+PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.fits                   IMAGE     MASK      CHIP       TRUE      MEF
 
 PPIMAGE.CHIP.MEF      OUTPUT {OUTPUT}.ch.fits                 IMAGE     COMP_IMG  CHIP       TRUE      MEF
@@ -101,6 +127,6 @@
 PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits               IMAGE     COMP_IMG  FPA        TRUE      MEF
 PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits               IMAGE     COMP_IMG  FPA        TRUE      MEF
-PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   IMAGE     NONE      FPA        TRUE      SPLIT
-PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   IMAGE     NONE      FPA        TRUE      SPLIT
+PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits   IMAGE     NONE      CHIP       TRUE      SPLIT
+PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits   IMAGE     NONE      CHIP       TRUE      SPLIT
 
 PPIMAGE.STATS         OUTPUT {OUTPUT}.stats                   STATS     NONE      FPA        TRUE      MEF
@@ -114,5 +140,12 @@
 PPIMAGE.JPEG2         OUTPUT {OUTPUT}.b2.jpg                  JPEG      NONE      FPA        TRUE      NONE
 
-PPMERGE.OUTPUT        OUTPUT {OUTPUT}.fits                    IMAGE     NONE      FPA        TRUE      MEF
+PPMERGE.OUTPUT.MASK      OUTPUT {OUTPUT}.fits                 MASK      NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.BIAS      OUTPUT {OUTPUT}.fits                 IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.DARK      OUTPUT {OUTPUT}.fits                 DARK      NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.SHUTTER   OUTPUT {OUTPUT}.fits                 IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.FLAT      OUTPUT {OUTPUT}.fits                 IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.FRINGE    OUTPUT {OUTPUT}.fits                 FRINGE    NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.SIGMA     OUTPUT {OUTPUT}.sigma.fits           IMAGE     NONE      CHIP       TRUE      NONE
+PPMERGE.OUTPUT.COUNT     OUTPUT {OUTPUT}.count.fits           IMAGE     NONE      CHIP       TRUE      NONE
 
 DVOCORR.MEF.OUTPUT    OUTPUT {OUTPUT}.fc.fits                 IMAGE     NONE      CHIP       TRUE      MEF
@@ -132,5 +165,4 @@
 PSPHOT.OUT.CMF.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.cmf         CMF       NONE      CHIP       TRUE      SPLIT
 PSPHOT.OUT.CMF.MEF    OUTPUT {OUTPUT}.cmf                     CMF       NONE      CHIP       TRUE      MEF
-
 PSPHOT.PSF.SAVE       OUTPUT {OUTPUT}.psf                     PSF       NONE      CHIP       TRUE      MEF
 
@@ -142,5 +174,6 @@
 PSASTRO.OUT.CMF.SPL   OUTPUT {OUTPUT}.{CHIP.NAME}.smf         CMF       NONE      CHIP       TRUE      SPLIT
 PSASTRO.OUT.CMF.MEF   OUTPUT {OUTPUT}.smf                     CMF       NONE      FPA        TRUE      MEF
-PSASTRO.OUT.ASTROM    OUTPUT {OUTPUT}.ast                     ASTROM    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
 
 PSWARP.OUTPUT         OUTPUT {OUTPUT}.fits                    IMAGE     COMP_IMG  FPA        TRUE      NONE
