Index: trunk/ippconfig/simmosaic/camera.config
===================================================================
--- trunk/ippconfig/simmosaic/camera.config	(revision 13285)
+++ trunk/ippconfig/simmosaic/camera.config	(revision 13318)
@@ -129,23 +129,23 @@
    PPIMAGE.BIN2        OUTPUT   {OUTPUT}.{CHIP.NAME}.b2.fits   IMAGE      CHIP       TRUE      NONE
 
-   DVOCORR.OUTPUT      OUTPUT 	{OUTPUT}.fc.fits               IMAGE      FPA        TRUE      NONE
-   DVOFLAT.OUTPUT      OUTPUT 	{OUTPUT}.co.fits               IMAGE      FPA        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}.res.fits  	       IMAGE      FPA        TRUE      NONE
-   PSPHOT.BACKGND      OUTPUT   {OUTPUT}.bck.fits  	       IMAGE      FPA        TRUE      NONE
-   PSPHOT.BACKSUB      OUTPUT   {OUTPUT}.sub.fits  	       IMAGE      FPA        TRUE      NONE
-   PSPHOT.BACKMDL      OUTPUT   {OUTPUT}.mdl.fits  	       IMAGE      FPA        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}           	       RAW        FPA        TRUE      NONE
-   PSPHOT.OUTPUT.SX    OUTPUT   {OUTPUT}.sx        	       SX         FPA        TRUE      NONE
-   PSPHOT.OUTPUT.OBJ   OUTPUT   {OUTPUT}.obj       	       OBJ        FPA        TRUE      NONE
-   PSPHOT.OUTPUT.CMP   OUTPUT   {OUTPUT}.cmp       	       CMP        FPA        TRUE      NONE
-   PSPHOT.OUTPUT.CMF   OUTPUT   {OUTPUT}.cmf       	       CMF        FPA        TRUE      NONE
-   PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.psf       	       PSF        FPA        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.OUTPUT.CMF   OUTPUT   {OUTPUT}.{CHIP.NAME}.cmf       CMF        CHIP       TRUE      NONE
+   PSPHOT.PSF.SAVE     OUTPUT   {OUTPUT}.{CHIP.NAME}.psf       PSF        CHIP       TRUE      NONE
 
-   PSPHOT.MOMENT.PLT   OUTPUT   {OUTPUT}.mnt.png   	       KAPA       FPA        TRUE      NONE
-   PSPHOT.PSFMODEL.PLT OUTPUT   {OUTPUT}.psf.png   	       KAPA       FPA        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
 
-   PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.smp       	       CMP        FPA        TRUE      NONE
+   PSASTRO.OUTPUT.CMP  OUTPUT   {OUTPUT}.{CHIP.NAME}.smp       CMP        CHIP       TRUE      NONE
 
    PSWARP.OUTPUT       OUTPUT   {OUTPUT}.fits      	       IMAGE      FPA        TRUE      NONE
@@ -165,2 +165,10 @@
 # user can set the colormap, scaling method, scaling range (JPEG only)
 # user can set the extension name for the data and header segments (CMF only)
+
+
+EXTNAME.RULES	METADATA
+	CMF.HEAD	STR	{CHIP.NAME}.hdr
+	CMF.DATA	STR	{CHIP.NAME}.psf
+	PSF.TABLE	STR	{CHIP.NAME}.psf_model
+	PSF.RESID	STR	{CHIP.NAME}.psf_resid
+END