Index: /trunk/ippconfig/cfh12k/camera.config
===================================================================
--- /trunk/ippconfig/cfh12k/camera.config	(revision 13531)
+++ /trunk/ippconfig/cfh12k/camera.config	(revision 13532)
@@ -218,7 +218,7 @@
    PSPHOT.PSF.SAVE       OUTPUT {OUTPUT}.psf                    PSF       CHIP       TRUE      MEF
 
-   SOURCE.PLOT.MOMENTS   OUTPUT {OUTPUT}.mnt.png                KAPA      FPA       TRUE      MEF
-   SOURCE.PLOT.PSFMODEL  OUTPUT {OUTPUT}.psf.png                KAPA      FPA       TRUE      MEF
-   SOURCE.PLOT.APRESID   OUTPUT {OUTPUT}.dap.png                KAPA      FPA       TRUE      MEF
+   SOURCE.PLOT.MOMENTS   OUTPUT {OUTPUT}.mnt.png                KAPA      FPA        TRUE      NONE
+   SOURCE.PLOT.PSFMODEL  OUTPUT {OUTPUT}.psf.png                KAPA      FPA        TRUE      NONE
+   SOURCE.PLOT.APRESID   OUTPUT {OUTPUT}.dap.png                KAPA      FPA        TRUE      NONE
 
    PSASTRO.OUTPUT.CMF    OUTPUT {OUTPUT}a.cmf                   CMF       CHIP       TRUE      NONE
@@ -238,4 +238,5 @@
   CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT?
 
+  PSF.HEAD  STR {CHIP.NAME}.hdr
   PSF.TABLE STR {CHIP.NAME}.psf_model
   PSF.RESID STR {CHIP.NAME}.psf_resid
Index: /trunk/ippconfig/ctio_mosaic2/camera.config
===================================================================
--- /trunk/ippconfig/ctio_mosaic2/camera.config	(revision 13531)
+++ /trunk/ippconfig/ctio_mosaic2/camera.config	(revision 13532)
@@ -89,6 +89,6 @@
 FILERULES METADATA
    ### Redirections
-   PSASTRO.INPUT      STR PSASTRO.INPUT.CMP
-   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMP
+   PSASTRO.INPUT      STR PSASTRO.INPUT.CMF
+   PSASTRO.OUTPUT     STR PSASTRO.OUTPUT.CMF
    PSPHOT.OUTPUT      STR PSPHOT.OUTPUT.CMF
 
@@ -133,5 +133,5 @@
    PSPHOT.OUTPUT.CMP   OUTPUT {OUTPUT}.{CHIP.NAME}.cmp       CHIP       CMP       TRUE      NONE
 
+   PSASTRO.OUTPUT.CMF  OUTPUT {OUTPUT}a.cmf                  CHIP       CMF       TRUE      NONE
    PSASTRO.OUTPUT.CMP  OUTPUT {OUTPUT}.{CHIP.NAME}.smp       CHIP       CMP       TRUE      NONE
-
 END
Index: /trunk/ippconfig/isp/camera.config
===================================================================
--- /trunk/ippconfig/isp/camera.config	(revision 13531)
+++ /trunk/ippconfig/isp/camera.config	(revision 13532)
@@ -178,4 +178,5 @@
   CMF.DATA STR cmf.psf # use .PSF and .EXT?
 
+  PSF.HEAD  STR	hdr
   PSF.TABLE STR psf_model
   PSF.RESID STR psf_resid
Index: /trunk/ippconfig/megacam/camera.config
===================================================================
--- /trunk/ippconfig/megacam/camera.config	(revision 13531)
+++ /trunk/ippconfig/megacam/camera.config	(revision 13532)
@@ -80,6 +80,4 @@
 END
 
-DVO.CAMERADIR   STR     megacam         # Camera directory for DVO
-
 # Table of strings to use for the class identifier (see ippdb) according to the file level.
 CLASSID         METADATA
@@ -237,4 +235,5 @@
    SOURCE.PLOT.MOMENTS   OUTPUT {OUTPUT}.mnt.png              	KAPA      CHIP       TRUE      NONE
    SOURCE.PLOT.PSFMODEL  OUTPUT {OUTPUT}.psf.png              	KAPA      CHIP       TRUE      NONE
+   SOURCE.PLOT.APRESID   OUTPUT {OUTPUT}.dap.png                KAPA      CHIP       TRUE      NONE
 
    PSASTRO.OUTPUT.CMF    OUTPUT {OUTPUT}a.cmf                  	CMF       CHIP       TRUE      NONE
@@ -254,4 +253,5 @@
   CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT?
 
+  PSF.HEAD  STR	{CHIP.NAME}.hdr
   PSF.TABLE STR {CHIP.NAME}.psf_model
   PSF.RESID STR {CHIP.NAME}.psf_resid
Index: /trunk/ippconfig/simmosaic/camera.config
===================================================================
--- /trunk/ippconfig/simmosaic/camera.config	(revision 13531)
+++ /trunk/ippconfig/simmosaic/camera.config	(revision 13532)
@@ -107,4 +107,5 @@
    PPIMAGE.FLAT       INPUT    @DETDB                        CELL       IMAGE     
    PPIMAGE.MASK       INPUT    @DETDB                        CELL       IMAGE     
+   PSPHOT.LOAD        INPUT    none.fits                     CHIP       IMAGE     
    PSPHOT.INPUT       INPUT    none.fits                     CHIP       IMAGE     
    PSWARP.INPUT       INPUT    none.fits                     FPA        IMAGE     
@@ -142,6 +143,7 @@
    PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.{CHIP.NAME}.psf       PSF        CHIP       TRUE      NONE
 
-   PSPHOT.MOMENT.PLT   OUTPUT   {OUTPUT}.{CHIP.NAME}.mnt.png   KAPA       CHIP       TRUE      NONE
-   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.{CHIP.NAME}.psf.png   KAPA       CHIP       TRUE      NONE
+   SOURCE.PLOT.MOMENTS  OUTPUT  {OUTPUT}.{CHIP.NAME}.mnt.png   KAPA       CHIP       TRUE      NONE
+   SOURCE.PLOT.PSFMODEL OUTPUT  {OUTPUT}.{CHIP.NAME}.psf.png   KAPA       CHIP       TRUE      NONE
+   SOURCE.PLOT.APRESID  OUTPUT  {OUTPUT}.{CHIP.NAME}.dap.png   KAPA       CHIP       TRUE      NONE
 
    PSASTRO.OUTPUT.SPL  OUTPUT   {OUTPUT}.{CHIP.NAME}.smf       CMF        CHIP       TRUE      NONE
@@ -169,4 +171,5 @@
 	CMF.HEAD	STR	{CHIP.NAME}.hdr
 	CMF.DATA	STR	{CHIP.NAME}.psf
+	PSF.HEAD	STR	{CHIP.NAME}.hdr
 	PSF.TABLE	STR	{CHIP.NAME}.psf_model
 	PSF.RESID	STR	{CHIP.NAME}.psf_resid
Index: /trunk/ippconfig/simple/camera.config
===================================================================
--- /trunk/ippconfig/simple/camera.config	(revision 13531)
+++ /trunk/ippconfig/simple/camera.config	(revision 13532)
@@ -165,4 +165,5 @@
   CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT?
 
+  PSF.HEAD  STR {CHIP.NAME}.hdr
   PSF.TABLE STR {CHIP.NAME}.psf_model
   PSF.RESID STR {CHIP.NAME}.psf_resid
Index: /trunk/ippconfig/simtest/camera.config
===================================================================
--- /trunk/ippconfig/simtest/camera.config	(revision 13531)
+++ /trunk/ippconfig/simtest/camera.config	(revision 13532)
@@ -135,6 +135,7 @@
    PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.psf       	     PSF        FPA        TRUE      NONE
 
-   PSPHOT.MOMENT.PLT   OUTPUT   {OUTPUT}.mnt.png   	     KAPA       FPA        TRUE      NONE
-   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.psf.png   	     KAPA       FPA        TRUE      NONE
+   SOURCE.PLOT.MOMENTS  OUTPUT  {OUTPUT}.mnt.png   	     KAPA       FPA        TRUE      NONE
+   SOURCE.PLOT.PSFMODEL OUTPUT  {OUTPUT}.psf.png   	     KAPA       FPA        TRUE      NONE
+   SOURCE.PLOT.APRESID  OUTPUT  {OUTPUT}.dap.png             KAPA       FPA        TRUE      NONE
 
    PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp       	     CMP        FPA        TRUE      NONE
@@ -152,4 +153,5 @@
   CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT?
 
+  PSF.HEAD  STR	{CHIP.NAME}.hdr
   PSF.TABLE STR {CHIP.NAME}.psf_model
   PSF.RESID STR {CHIP.NAME}.psf_resid