Index: trunk/ippconfig/gpc1/camera.config
===================================================================
--- trunk/ippconfig/gpc1/camera.config	(revision 14560)
+++ trunk/ippconfig/gpc1/camera.config	(revision 14695)
@@ -142,5 +142,6 @@
 # Recipe options
 RECIPES		METADATA
-#	PSPHOT		STR	psphot.config		# psphot details
+	PPIMAGE		STR	gpc1/ppImage.config		# psphot details
+#	PSPHOT		STR	gpc1/psphot.config		# psphot details
 END
 
@@ -184,9 +185,9 @@
    ### input file definitions
    TYPE               INPUT    FILENAME.RULE                 DATA.LEVEL FILE.TYPE 
-   PPIMAGE.INPUT      INPUT    none.fits                     FPA        IMAGE     
-   INPUT.MASK         INPUT    none.fits                     FPA        MASK      
-   INPUT.WEIGHT       INPUT    none.fits                     FPA        WEIGHT    
-   INPUT.PSF          INPUT    none.fits                     READOUT	PSF       
-   INPUT.SRC          INPUT    none.fits                     READOUT	CMF       
+   PPIMAGE.INPUT      INPUT    none.fits                     CHIP       IMAGE     
+   INPUT.MASK         INPUT    none.fits                     CHIP       MASK      
+   INPUT.WEIGHT       INPUT    none.fits                     CHIP       WEIGHT    
+   INPUT.PSF          INPUT    none.fits                     CHIP	PSF       
+   INPUT.SRC          INPUT    none.fits                     CHIP	CMF       
    PPIMAGE.BIAS       INPUT    @DETDB                        CHIP       IMAGE     
    PPIMAGE.DARK       INPUT    @DETDB                        CHIP       IMAGE     
@@ -221,59 +222,63 @@
 
    ### output file definitions
-   TYPE                OUTPUT   FILENAME.RULE      	       FILE.TYPE  DATA.LEVEL FILE.SAVE FILE.FORMAT
-   PPIMAGE.OUTPUT      OUTPUT   {OUTPUT}.{CHIP.NAME}.fits      IMAGE      CHIP       TRUE      NONE
-   PPIMAGE.OUTPUT.MASK OUTPUT   {OUTPUT}.{CHIP.NAME}.mask.fits MASK       CHIP       TRUE      NONE
-   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits   WEIGHT     CHIP       TRUE      NONE
-   PPIMAGE.OUTPUT.CHIP OUTPUT 	{OUTPUT}.{CHIP.NAME}.ch.fits   IMAGE      CHIP       TRUE      NONE
-   PPIMAGE.OUTPUT.FPA1 OUTPUT 	{OUTPUT}.b1.fits   	       IMAGE      FPA        TRUE      NONE
-   PPIMAGE.OUTPUT.FPA2 OUTPUT 	{OUTPUT}.b2.fits   	       IMAGE      FPA        TRUE      NONE
-
-   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg    	       JPEG       FPA        TRUE      NONE
-   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg    	       JPEG       FPA        TRUE      NONE
-   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.{CHIP.NAME}.b1.fits   IMAGE      CHIP       TRUE      NONE
-   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.{CHIP.NAME}.b2.fits   IMAGE      CHIP       TRUE      NONE
-
-   DVOCORR.OUTPUT      OUTPUT 	{OUTPUT}.{CHIP.NAME}.fc.fits   IMAGE      CHIP       TRUE      NONE
-   DVOFLAT.OUTPUT      OUTPUT 	{OUTPUT}.{CHIP.NAME}.co.fits   IMAGE      CHIP       TRUE      NONE
-							       	        									
-   PSPHOT.RESID        OUTPUT   {OUTPUT}.{CHIP.NAME}.res.fits  IMAGE      CHIP       TRUE      NONE
-   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.{CHIP.NAME}.bck.fits  IMAGE      CHIP       TRUE      NONE
-   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.{CHIP.NAME}.sub.fits  IMAGE      CHIP       TRUE      NONE
-   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.{CHIP.NAME}.mdl.fits  IMAGE      CHIP       TRUE      NONE
-
-   PSPHOT.OUTPUT.RAW   OUTPUT   {OUTPUT}.{CHIP.NAME}           RAW        CHIP       TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT   {OUTPUT}.{CHIP.NAME}.sx        SX         CHIP       TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT   {OUTPUT}.{CHIP.NAME}.obj       OBJ        CHIP       TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT   {OUTPUT}.{CHIP.NAME}.cmp       CMP        CHIP       TRUE      NONE
-   PSPHOT.OUT.CMF.SPL  OUTPUT   {OUTPUT}.{CHIP.NAME}.cmf       CMF        CHIP       TRUE      NONE
-   PSPHOT.OUT.CMF.MEF  OUTPUT   {OUTPUT}.cmf       	       CMF        FPA        TRUE      NONE
-
-   PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.psf       	       PSF        FPA        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.CMP  OUTPUT   {OUTPUT}.{CHIP.NAME}.smp       CMP        CHIP       TRUE      NONE
-   PSASTRO.OUT.CMF.SPL OUTPUT   {OUTPUT}.{CHIP.NAME}.smf       CMF        CHIP       TRUE      NONE
-   PSASTRO.OUT.CMF.MEF OUTPUT   {OUTPUT}.smf       	       CMF        FPA        TRUE      NONE
-
-   PSWARP.OUTPUT       OUTPUT   {OUTPUT}.fits      	       IMAGE      FPA        TRUE      NONE
-   PSWARP.OUTPUT.MASK  OUTPUT   {OUTPUT}.mask.fits             MASK       FPA        TRUE      NONE
-   PSWARP.OUTPUT.WEIGHT OUTPUT  {OUTPUT}.wt.fits               WEIGHT     FPA        TRUE      NONE
-   PSWARP.BIN1         OUTPUT   {OUTPUT}.b1.fits   	       IMAGE      FPA        TRUE      NONE
-   PSWARP.BIN2         OUTPUT   {OUTPUT}.b2.fits   	       IMAGE      FPA        TRUE      NONE
-
-   PPSUB.OUTPUT        OUTPUT   {OUTPUT}.fits                  IMAGE      FPA        TRUE      NONE
-   PPSUB.OUTPUT.MASK   OUTPUT   {OUTPUT}.mask.fits             MASK       FPA        TRUE      NONE
-   PPSUB.OUTPUT.WEIGHT OUTPUT   {OUTPUT}.wt.fits               WEIGHT     FPA        TRUE      NONE
-
-   PPSTACK.OUTPUT      OUTPUT   {OUTPUT}.fits                  IMAGE      FPA        TRUE      NONE
-   PPSTACK.OUTPUT.MASK OUTPUT   {OUTPUT}.mask.fits             MASK       FPA        TRUE      NONE
-
-   PPSIM.OUTPUT        OUTPUT   {OUTPUT}.fits                  IMAGE      FPA        TRUE      SIMTEST
-
-   LOG.IMFILE            OUTPUT {OUTPUT}.{CHIP.NAME}.log       TEXT       CHIP       TRUE      NONE
-   LOG.EXP               OUTPUT {OUTPUT}.log                   TEXT       FPA        TRUE      NONE
+   TYPE                OUTPUT   FILENAME.RULE      	       	FILE.TYPE  DATA.LEVEL FILE.SAVE FILE.FORMAT
+   PPIMAGE.OUTPUT      OUTPUT   {OUTPUT}.{CHIP.NAME}.fits      	IMAGE      CHIP       TRUE      NONE
+   PPIMAGE.OUTPUT.MASK OUTPUT   {OUTPUT}.{CHIP.NAME}.mk.fits   	MASK       CHIP       TRUE      NONE
+   PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits   	WEIGHT     CHIP       TRUE      NONE
+
+   PPIMAGE.CHIP        OUTPUT 	{OUTPUT}.{CHIP.NAME}.ch.fits   	IMAGE      CHIP       TRUE      NONE
+   PPIMAGE.CHIP.MASK   OUTPUT 	{OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK       CHIP       TRUE      NONE
+   PPIMAGE.CHIP.WEIGHT OUTPUT 	{OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT     CHIP       TRUE      NONE
+
+   PPIMAGE.OUTPUT.FPA1 OUTPUT 	{OUTPUT}.b1.fits   	       	IMAGE      FPA        TRUE      NONE
+   PPIMAGE.OUTPUT.FPA2 OUTPUT 	{OUTPUT}.b2.fits   	       	IMAGE      FPA        TRUE      NONE
+
+   PPIMAGE.JPEG1       OUTPUT   {OUTPUT}.b1.jpg    	       	JPEG       FPA        TRUE      NONE
+   PPIMAGE.JPEG2       OUTPUT   {OUTPUT}.b2.jpg    	       	JPEG       FPA        TRUE      NONE
+   PPIMAGE.BIN1        OUTPUT   {OUTPUT}.{CHIP.NAME}.b1.fits   	IMAGE      CHIP       TRUE      NONE
+   PPIMAGE.BIN2        OUTPUT   {OUTPUT}.{CHIP.NAME}.b2.fits   	IMAGE      CHIP       TRUE      NONE
+
+   DVOCORR.OUTPUT      OUTPUT 	{OUTPUT}.{CHIP.NAME}.fc.fits   	IMAGE      CHIP       TRUE      NONE
+   DVOFLAT.OUTPUT      OUTPUT 	{OUTPUT}.{CHIP.NAME}.co.fits   	IMAGE      CHIP       TRUE      NONE
+
+   PSPHOT.RESID        OUTPUT   {OUTPUT}.{CHIP.NAME}.res.fits  	IMAGE      CHIP       TRUE      NONE
+   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.{CHIP.NAME}.bck.fits  	IMAGE      CHIP       TRUE      NONE
+   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.{CHIP.NAME}.sub.fits  	IMAGE      CHIP       TRUE      NONE
+   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.{CHIP.NAME}.mdl.fits  	IMAGE      CHIP       TRUE      NONE
+
+   PSPHOT.OUTPUT.RAW   OUTPUT   {OUTPUT}.{CHIP.NAME}           	RAW        CHIP       TRUE      NONE
+   PSPHOT.OUTPUT.SX    OUTPUT   {OUTPUT}.{CHIP.NAME}.sx        	SX         CHIP       TRUE      NONE
+   PSPHOT.OUTPUT.OBJ   OUTPUT   {OUTPUT}.{CHIP.NAME}.obj       	OBJ        CHIP       TRUE      NONE
+   PSPHOT.OUTPUT.CMP   OUTPUT   {OUTPUT}.{CHIP.NAME}.cmp       	CMP        CHIP       TRUE      NONE
+   PSPHOT.OUT.CMF.SPL  OUTPUT   {OUTPUT}.{CHIP.NAME}.cmf       	CMF        CHIP       TRUE      NONE
+   PSPHOT.OUT.CMF.MEF  OUTPUT   {OUTPUT}.cmf       	       	CMF        FPA        TRUE      NONE
+
+   PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.psf       	       	PSF        FPA        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.CMP  OUTPUT   {OUTPUT}.{CHIP.NAME}.smp       	CMP        CHIP       TRUE      NONE
+   PSASTRO.OUT.CMF.SPL OUTPUT   {OUTPUT}.{CHIP.NAME}.smf       	CMF        CHIP       TRUE      NONE
+   PSASTRO.OUT.CMF.MEF OUTPUT   {OUTPUT}.smf       	       	CMF        FPA        TRUE      NONE
+
+   PSWARP.OUTPUT       OUTPUT   {OUTPUT}.fits      	       	IMAGE      FPA        TRUE      NONE
+   PSWARP.OUTPUT.MASK  OUTPUT   {OUTPUT}.mask.fits             	MASK       FPA        TRUE      NONE
+   PSWARP.OUTPUT.WEIGHT OUTPUT  {OUTPUT}.wt.fits               	WEIGHT     FPA        TRUE      NONE
+   PSWARP.BIN1         OUTPUT   {OUTPUT}.b1.fits   	       	IMAGE      FPA        TRUE      NONE
+   PSWARP.BIN2         OUTPUT   {OUTPUT}.b2.fits   	       	IMAGE      FPA        TRUE      NONE
+
+   PPSUB.OUTPUT        OUTPUT   {OUTPUT}.fits                  	IMAGE      FPA        TRUE      NONE
+   PPSUB.OUTPUT.MASK   OUTPUT   {OUTPUT}.mask.fits             	MASK       FPA        TRUE      NONE
+   PPSUB.OUTPUT.WEIGHT OUTPUT   {OUTPUT}.wt.fits               	WEIGHT     FPA        TRUE      NONE
+
+   PPSTACK.OUTPUT      OUTPUT   {OUTPUT}.fits                  	IMAGE      FPA        TRUE      NONE
+   PPSTACK.OUTPUT.MASK OUTPUT   {OUTPUT}.mask.fits             	MASK       FPA        TRUE      NONE
+
+   PPSIM.OUTPUT        OUTPUT   {OUTPUT}.fits                  	IMAGE      FPA        TRUE      SIMTEST
+
+   LOG.IMFILE            OUTPUT {OUTPUT}.{CHIP.NAME}.log       	TEXT       CHIP       TRUE      NONE
+   LOG.EXP               OUTPUT {OUTPUT}.log                   	TEXT       FPA        TRUE      NONE
 END
 
