Index: trunk/ippconfig/mosaic2/Makefile.am
===================================================================
--- trunk/ippconfig/mosaic2/Makefile.am	(revision 17405)
+++ trunk/ippconfig/mosaic2/Makefile.am	(revision 17523)
@@ -6,5 +6,4 @@
 	dvo.layout \
 	camera.config \
-        filerules-mef.mdc \
 	format.config \
 	ppImage.config \
Index: trunk/ippconfig/mosaic2/camera.config
===================================================================
--- trunk/ippconfig/mosaic2/camera.config	(revision 17405)
+++ trunk/ippconfig/mosaic2/camera.config	(revision 17523)
@@ -76,191 +76,10 @@
 
 # Reduction classes
-REDUCTION	METADATA
-	# Detrend processing
-	DETREND		METADATA
-		BIAS_PROCESS	STR	PPIMAGE_O
-		BIAS_RESID	STR	PPIMAGE_B
-		BIAS_VERIFY	STR	PPIMAGE_OB
-		BIAS_STACK	STR	PPMERGE_BIAS
-		DARK_PROCESS	STR	PPIMAGE_OB
-		DARK_RESID	STR	PPIMAGE_D
-		DARK_VERIFY	STR	PPIMAGE_OBD
-		DARK_STACK	STR	PPMERGE_DARK
-		SHUTTER_PROCESS	STR	PPIMAGE_OBD
-		SHUTTER_RESID	STR	PPIMAGE_S
-		SHUTTER_VERIFY	STR	PPIMAGE_OBDS
-		SHUTTER_STACK	STR	PPMERGE_SHUTTER
-		FLAT_PROCESS	STR	PPIMAGE_OBDS
-		FLAT_RESID	STR	PPIMAGE_F
-		FLAT_VERIFY	STR	PPIMAGE_OBDSF
-		FLAT_STACK	STR	PPMERGE_FLAT
-		FRINGE_PROCESS	STR	PPIMAGE_OBDSF
-		FRINGE_RESID	STR	PPIMAGE_R
-		FRINGE_VERIFY	STR	PPIMAGE_OBDSFR
-		FRINGE_STACK	STR	PPMERGE_FRINGE
+REDUCTION	STR	recipes/reductionClasses.mdc
 
-		# Generation of pixel masks from darks and flats
-		DARKMASK_PROCESS	STR	PPIMAGE_OBD
-		DARKMASK_RESID		STR	PPIMAGE_N
-		DARKMASK_VERIFY		STR	PPIMAGE_OBD
-		DARKMASK_STACK		STR	PPMERGE_DARKMASK
-		FLATMASK_PROCESS	STR	PPIMAGE_OBDSF
-		FLATMASK_RESID		STR	PPIMAGE_N
-		FLATMASK_VERIFY		STR	PPIMAGE_OBDSF
-		FLATMASK_STACK		STR	PPMERGE_FLATMASK
-		JPEG_BIN1_IMAGE_DARKMASK STR	PPIMAGE_J1_IMAGE_M
-		JPEG_BIN2_IMAGE_DARKMASK STR	PPIMAGE_J2_IMAGE_M
-		JPEG_BIN1_IMAGE_FLATMASK STR	PPIMAGE_J1_IMAGE_M
-		JPEG_BIN2_IMAGE_FLATMASK STR	PPIMAGE_J2_IMAGE_M
-		JPEG_BIN1_RESID_DARKMASK STR	PPIMAGE_J1_RESID_M
-		JPEG_BIN2_RESID_DARKMASK STR	PPIMAGE_J2_RESID_M
-		JPEG_BIN1_RESID_FLATMASK STR	PPIMAGE_J1_RESID_M
-		JPEG_BIN2_RESID_FLATMASK STR	PPIMAGE_J2_RESID_M
+FITSTYPES       STR     recipes/fitstypes.mdc
 
- 		JPEG_BIN1_IMAGE_BIAS     STR  PPIMAGE_J1_IMAGE_B
-		JPEG_BIN1_IMAGE_DARK     STR  PPIMAGE_J1_IMAGE_B
-		JPEG_BIN1_IMAGE_SHUTTER  STR  PPIMAGE_J1_IMAGE_F
-		JPEG_BIN1_IMAGE_FLAT     STR  PPIMAGE_J1_IMAGE_F
-		JPEG_BIN1_IMAGE_DOMEFLAT STR  PPIMAGE_J1_IMAGE_F
-		JPEG_BIN1_IMAGE_SKYFLAT  STR  PPIMAGE_J1_IMAGE_F
-		JPEG_BIN1_IMAGE_FRINGE   STR  PPIMAGE_J1_IMAGE_R
- 		JPEG_BIN2_IMAGE_BIAS     STR  PPIMAGE_J2_IMAGE_B
-		JPEG_BIN2_IMAGE_DARK     STR  PPIMAGE_J2_IMAGE_B
-		JPEG_BIN2_IMAGE_SHUTTER  STR  PPIMAGE_J2_IMAGE_F
-		JPEG_BIN2_IMAGE_FLAT     STR  PPIMAGE_J2_IMAGE_F
-		JPEG_BIN2_IMAGE_DOMEFLAT STR  PPIMAGE_J2_IMAGE_F
-		JPEG_BIN2_IMAGE_SKYFLAT  STR  PPIMAGE_J2_IMAGE_F
-		JPEG_BIN2_IMAGE_FRINGE   STR  PPIMAGE_J2_IMAGE_R
-
- 		JPEG_BIN1_RESID_BIAS     STR  PPIMAGE_J1_RESID_B
-		JPEG_BIN1_RESID_DARK     STR  PPIMAGE_J1_RESID_B
-		JPEG_BIN1_RESID_SHUTTER  STR  PPIMAGE_J1_RESID_F
-		JPEG_BIN1_RESID_FLAT     STR  PPIMAGE_J1_RESID_F
-		JPEG_BIN1_RESID_DOMEFLAT STR  PPIMAGE_J1_RESID_F
-		JPEG_BIN1_RESID_SKYFLAT  STR  PPIMAGE_J1_RESID_F
-		JPEG_BIN1_RESID_FRINGE   STR  PPIMAGE_J1_RESID_R
- 		JPEG_BIN2_RESID_BIAS     STR  PPIMAGE_J2_RESID_B
-		JPEG_BIN2_RESID_DARK     STR  PPIMAGE_J2_RESID_B
-		JPEG_BIN2_RESID_SHUTTER  STR  PPIMAGE_J2_RESID_F
-		JPEG_BIN2_RESID_FLAT     STR  PPIMAGE_J2_RESID_F
-		JPEG_BIN2_RESID_DOMEFLAT STR  PPIMAGE_J2_RESID_F
-		JPEG_BIN2_RESID_SKYFLAT  STR  PPIMAGE_J2_RESID_F
-		JPEG_BIN2_RESID_FRINGE   STR  PPIMAGE_J2_RESID_R
-	END
-	# Processing raw data
-	DEFAULT		METADATA
-		CHIP		STR	PPIMAGE_OBDSFRA
- 		JPEG_BIN1       STR     PPIMAGE_J1
- 		JPEG_BIN2       STR     PPIMAGE_J2
-	END
-
-       # photometry & astrometry for pre-detrended images
-	PROCESSED	METADATA
-		CHIP		STR	PPIMAGE_PA
- 		JPEG_BIN1       STR     PPIMAGE_J1
- 		JPEG_BIN2       STR     PPIMAGE_J2
-	END
-
-	# Detrend Processing only for raw data
-	DETREND_ONLY		METADATA
-		CHIP		STR	PPIMAGE_DET_ONLY
- 		JPEG_BIN1       STR     PPIMAGE_J1
- 		JPEG_BIN2       STR     PPIMAGE_J2
-	END
-
-	# Just apply a mask and do photometry
-	MASKPHOT		METADATA
-		CHIP		STR	PPIMAGE_MASKPHOT
- 		JPEG_BIN1       STR     PPIMAGE_J1
- 		JPEG_BIN2       STR     PPIMAGE_J2
-	END
-
-END
-
-FITS    METADATA
-# BITPIX(S32) is the bits per pixel for writing the output data
-# COMPRESSION(STR) = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm
-# TILE.[XYZ](S32) are the tile sizes.  0 means entire the dimension, so (0,1,1) forms tiles from rows
-# NOISE(S32) [0..16] is the number of "noise bits" to preserve when quantising floating point data
-# HSCALE(S32) is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression
-# HSMOOTH(S32) is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none
-# SCALING(STR) = NONE|RANGE|STDEV_POSITIVE|STDEV_NEGATIVE|STDEV_BOTH|MANUAL is the scaling scheme
-# BSCALE(F32) is the manual scaling to apply (when SCALING = MANUAL)
-# BZERO(F32) is the manual zero-point to apply (when SCALING = MANUAL)
-# STDEV.BITS(S32) is the number of bits to map to a standard deviation (when SCALING = STDEV_*)
-# STDEV.NUM(F32) is the number of standard deviations to the edge (when SCALING = STDEV_NEGATIVE|STDEV_POSITIVE)
-# FLOAT(STR) is the name of a custom floating-point type
-
-        DET_IMAGE       METADATA
-                BITPIX          S32     -32
-        END
-        DET_MASK        METADATA
-                BITPIX          S32     8
-        END
-        DET_WEIGHT      METADATA
-                BITPIX          S32     -32
-        END
-
-        SKY_IMAGE       METADATA
-                BITPIX          S32     -32
-        END
-        SKY_MASK        METADATA
-                BITPIX          S32     8
-        END
-        SKY_WEIGHT      METADATA
-                BITPIX          S32     -32
-        END
-
-        # Compressed positive image
-        COMP_IMG        METADATA
-               BITPIX          S32     16
-               SCALING         STR     STDEV_POSITIVE
-               STDEV.BITS      S32     4
-               STDEV.NUM       F32     10
-               COMPRESSION     STR     RICE
-               TILE.X          S32     0
-               TILE.Y          S32     1
-               TILE.Z          S32     1
-               NOISE           S32     8
-        END
-        # Compressed mask
-        COMP_MASK       METADATA
-               BITPIX          S32     8
-               COMPRESSION     STR     PLIO
-               TILE.X          S32     0
-               TILE.Y          S32     1
-               TILE.Z          S32     1
-               NOISE           S32     8
-        END
-        # Compressed weight image
-        COMP_WT         METADATA
-               BITPIX          S32     16
-               SCALING         STR     STDEV_POSITIVE
-               STDEV.BITS      S32     4
-               STDEV.NUM       F32     10
-               COMPRESSION     STR     RICE
-               TILE.X          S32     0
-               TILE.Y          S32     1
-               TILE.Z          S32     1
-               NOISE           S32     8
-        END
-        # Compressed subtraction image
-        COMP_SUB        METADATA
-               BITPIX          S32     16
-               SCALING         STR     STDEV_BOTH
-               STDEV.BITS      S32     4
-               STDEV.NUM       F32     5
-               COMPRESSION     STR     RICE
-               TILE.X          S32     0
-               TILE.Y          S32     1
-               TILE.Z          S32     1
-               NOISE           S32     8
-        END
-
-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: trunk/ippconfig/mosaic2/dvo.config
===================================================================
--- trunk/ippconfig/mosaic2/dvo.config	(revision 17405)
+++ trunk/ippconfig/mosaic2/dvo.config	(revision 17523)
@@ -8,7 +8,7 @@
 DATE-KEYWORD		DATE-OBS
 DATE-MODE		yyyy-mm-dd
-UT-KEYWORD		UTC-OBS
+UT-KEYWORD		NONE
 JD-KEYWORD		NONE
-MJD-KEYWORD		NONE
+MJD-KEYWORD		MJD-OBS
 
 # other keyword abstractions
Index: trunk/ippconfig/mosaic2/filerules-mef.mdc
===================================================================
--- trunk/ippconfig/mosaic2/filerules-mef.mdc	(revision 17405)
+++ 	(revision )
@@ -1,170 +1,0 @@
-### File rules for PHU=FPA, EXT=CHIP
-### Redirections
-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.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
-
-### input file definitions
-### use @DETDB entries to get the detrend images from the database
-### 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
-
-## files used by ppImage
-PPIMAGE.INPUT      INPUT @FILES        CHIP       IMAGE
-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 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.WEIGHT      INPUT @FILES        CHIP       WEIGHT     
-PSPHOT.PSF.LOAD    INPUT @FILES        CHIP       PSF       
-PSPHOT.INPUT.CMF   INPUT @FILES        CHIP       CMF       
-
-## files used by psastro 
-PSASTRO.INPUT.CMP  INPUT @FILES        CHIP       CMP
-PSASTRO.INPUT.CMF  INPUT @FILES        CHIP       CMF
-
-## files used by pswarp
-PSWARP.INPUT       INPUT @FILES        CHIP       IMAGE
-PSWARP.WEIGHT      INPUT @FILES        CHIP       WEIGHT
-PSWARP.MASK        INPUT @FILES        CHIP       MASK
-PSWARP.SKYCELL     INPUT @FILES        CHIP       IMAGE
-PSWARP.ASTROM      INPUT @FILES        CHIP       CMF
-
-PPSUB.INPUT        INPUT @FILES        FPA        IMAGE
-PPSUB.INPUT.MASK   INPUT @FILES        FPA        MASK
-PPSUB.INPUT.WEIGHT INPUT @FILES        FPA        WEIGHT
-PPSUB.REF          INPUT @FILES        FPA        IMAGE
-PPSUB.REF.MASK     INPUT @FILES        FPA        MASK
-PPSUB.REF.WEIGHT   INPUT @FILES        FPA        WEIGHT
-PPSUB.SOURCES      INPUT @FILES        FPA        CMF
-
-PPSTACK.INPUT      INPUT @FILES        FPA        IMAGE
-PPSTACK.INPUT.MASK INPUT @FILES        FPA        MASK
-PPSTACK.INPUT.WEIGHT INPUT @FILES      FPA        WEIGHT
-PPSTACK.SOURCES    INPUT @FILES        FPA        CMF
-
-PPSTAMP.INPUT      INPUT @FILES        CHIP       IMAGE
-
-PPARITH.INPUT.IMAGE INPUT @FILES        CHIP       IMAGE
-PPARITH.INPUT.MASK  INPUT @FILES        CHIP       MASK
-
-### output file definitions
-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
-PPIMAGE.OUT.WT.MEF    OUTPUT {OUTPUT}.wt.fits                 WEIGHT    COMP_WT   CHIP       TRUE      MEF
-PPIMAGE.OUTPUT.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits     IMAGE     NONE      CHIP       TRUE      SPLIT
-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.CHIP.MEF      OUTPUT {OUTPUT}.ch.fits                 IMAGE     COMP_IMG  CHIP       TRUE      MEF
-PPIMAGE.CHIP.MK.MEF   OUTPUT {OUTPUT}.ch.mk.fits              MASK      COMP_MASK CHIP       TRUE      MEF
-PPIMAGE.CHIP.WT.MEF   OUTPUT {OUTPUT}.ch.wt.fits              WEIGHT    COMP_WT   CHIP       TRUE      MEF
-PPIMAGE.CHIP.SPL      OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits     IMAGE     NONE      CHIP       TRUE      SPLIT
-PPIMAGE.CHIP.MK.SPL   OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits  MASK      NONE      CHIP       TRUE      SPLIT
-PPIMAGE.CHIP.WT.SPL   OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits  WEIGHT    NONE      CHIP       TRUE      SPLIT
-
-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.STATS         OUTPUT {OUTPUT}.stats                   STATS     NONE      FPA        TRUE      MEF
-
-PPIMAGE.BIN1.MEF      OUTPUT {OUTPUT}.b1c.fits                IMAGE     COMP_IMG  CHIP       TRUE      MEF
-PPIMAGE.BIN2.MEF      OUTPUT {OUTPUT}.b2c.fits                IMAGE     COMP_IMG  CHIP       TRUE      MEF
-PPIMAGE.BIN1.SPL      OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits     IMAGE     NONE      CHIP       TRUE      SPLIT
-PPIMAGE.BIN2.SPL      OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits     IMAGE     NONE      CHIP       TRUE      SPLIT
-
-PPIMAGE.JPEG1         OUTPUT {OUTPUT}.b1.jpg                  JPEG      NONE      FPA        TRUE      NONE
-PPIMAGE.JPEG2         OUTPUT {OUTPUT}.b2.jpg                  JPEG      NONE      FPA        TRUE      NONE
-
-PPMERGE.OUTPUT        OUTPUT {OUTPUT}.fits                    IMAGE     NONE      FPA        TRUE      MEF
-
-DVOCORR.MEF.OUTPUT    OUTPUT {OUTPUT}.fc.fits                 IMAGE     NONE      CHIP       TRUE      MEF
-DVOCORR.SPL.OUTPUT    OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits     IMAGE     NONE      CHIP       TRUE      SPLIT
-DVOFLAT.MEF.OUTPUT    OUTPUT {OUTPUT}.co.fits                 IMAGE     NONE      CHIP       TRUE      MEF
-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.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.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
-
-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}.{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
-
-PSWARP.OUTPUT         OUTPUT {OUTPUT}.fits                    IMAGE     COMP_IMG  FPA        TRUE      NONE
-PSWARP.OUTPUT.MASK    OUTPUT {OUTPUT}.mk.fits                 MASK      COMP_MASK FPA        TRUE      NONE
-PSWARP.OUTPUT.WEIGHT  OUTPUT {OUTPUT}.wt.fits                 WEIGHT    COMP_WT   FPA        TRUE      NONE
-PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf                     CMF       NONE      FPA        TRUE      NONE
-PSWARP.BIN1           OUTPUT {OUTPUT}.b1.fits                 IMAGE     COMP_IMG  FPA        TRUE      NONE
-PSWARP.BIN2           OUTPUT {OUTPUT}.b2.fits                 IMAGE     COMP_IMG  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
-PPSUB.OUTPUT.WEIGHT   OUTPUT {OUTPUT}.wt.fits                 WEIGHT    COMP_WT   FPA        TRUE      NONE
-
-PPSTACK.OUTPUT        OUTPUT {OUTPUT}.fits                    IMAGE     COMP_IMG  FPA        TRUE      NONE
-PPSTACK.OUTPUT.MASK   OUTPUT {OUTPUT}.mk.fits                 MASK      COMP_MASK FPA        TRUE      NONE
-PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits                 WEIGHT    COMP_WT   FPA        TRUE      NONE
-
-PPSTAMP.OUTPUT        OUTPUT {OUTPUT}.fits                    IMAGE     NONE      FPA        TRUE      NONE
-PPSTAMP.CHIP.MEF      OUTPUT {OUTPUT}.ch.fits                 IMAGE     NONE      CHIP       FALSE     MEF
-
-PPSIM.OUTPUT          OUTPUT {OUTPUT}.{CHIP.NAME}.fits        IMAGE     NONE      CHIP       TRUE      SPLIT
-
-PPARITH.OUTPUT.IMAGE  OUTPUT {OUTPUT}.fits                    IMAGE     COMP_IMG  CHIP       TRUE      NONE
-PPARITH.OUTPUT.MASK   OUTPUT {OUTPUT}.fits                    MASK      COMP_MASK 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
