Index: trunk/ippconfig/gpc1/Makefile.am
===================================================================
--- trunk/ippconfig/gpc1/Makefile.am	(revision 17472)
+++ trunk/ippconfig/gpc1/Makefile.am	(revision 17523)
@@ -8,5 +8,4 @@
 	format_raw.config \
 	format_mef.config \
-	filerules.mdc \
 	ppImage.config \
         ppMerge.config \
Index: trunk/ippconfig/gpc1/camera.config
===================================================================
--- trunk/ippconfig/gpc1/camera.config	(revision 17472)
+++ trunk/ippconfig/gpc1/camera.config	(revision 17523)
@@ -100,161 +100,10 @@
 END
 
-# 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 classes (recipes which are grouped together)
+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_RESID_B
-		JPEG_BIN2_IMAGE_DARKMASK STR	PPIMAGE_J2_RESID_B
-		JPEG_BIN1_RESID_DARKMASK STR	PPIMAGE_J1_RESID_B
-		JPEG_BIN2_RESID_DARKMASK STR	PPIMAGE_J2_RESID_B
+FITSTYPES       STR     recipes/fitstypes.mdc
 
-		JPEG_BIN1_IMAGE_FLATMASK STR	PPIMAGE_J1_RESID_F
-		JPEG_BIN2_IMAGE_FLATMASK STR	PPIMAGE_J2_RESID_F
-		JPEG_BIN1_RESID_FLATMASK STR	PPIMAGE_J1_RESID_F
-		JPEG_BIN2_RESID_FLATMASK STR	PPIMAGE_J2_RESID_F
-
- 		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
-END
-
-FITS    METADATA
-# BITPIX is the bits per pixel for writing the output data
-# COMP = NONE|RICE|GZIP|HCOMPRESS|PLIO is the compression algorithm
-# TILE.[XYZ] are the tile sizes.  0 means entire the dimension, so (0,1,1) forms tiles from rows
-# NOISE [0..16] is the number of "noise bits" to preserve when quantising floating point data; 16 for no loss
-# HSCALE is the scale factor for lossy compression with HCOMPRESS; 0 or 1 for none; 2*RMS --> 10x compression
-# HSMOOTH is the smoothing to apply to HCOMPRESSed data when decompressing; 0 for none
-
-# 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
-
-	COMP_POS	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
-	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
-	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
-
-FILERULES	STR	gpc1/filerules.mdc
+FILERULES	STR	recipes/filerules-split.mdc
 
 EXTNAME.RULES METADATA
Index: trunk/ippconfig/gpc1/filerules.mdc
===================================================================
--- trunk/ippconfig/gpc1/filerules.mdc	(revision 17472)
+++ 	(revision )
@@ -1,150 +1,0 @@
-PSASTRO.INPUT      STR PSASTRO.INPUT.CMF
-PSASTRO.OUTPUT     STR PSASTRO.OUT.CMF.SPL
-PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF
-PSPHOT.OUTPUT      STR PSPHOT.OUT.CMF.SPL
-
-### input file definitions
-TYPE                    INPUT    FILENAME.RULE                 DATA.LEVEL FILE.TYPE
-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       DARK
-PPIMAGE.SHUTTER         INPUT    @DETDB                        CHIP       IMAGE
-PPIMAGE.FLAT            INPUT    @DETDB                        CHIP       IMAGE
-PPIMAGE.MASK            INPUT    @DETDB                        CHIP       MASK
-
-## 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 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       
-
-PSWARP.INPUT            INPUT    none.fits                     CHIP       IMAGE
-PSWARP.WEIGHT           INPUT    none.fits                     CHIP       WEIGHT
-PSWARP.MASK             INPUT    none.fits                     CHIP       MASK
-PSWARP.SKYCELL          INPUT    none.fits                     FPA        IMAGE
-PSWARP.ASTROM           INPUT    none.fits                     CHIP       CMF
-
-PSASTRO.WCS             INPUT    none.fits                     CHIP       CMF
-PSASTRO.MODEL           INPUT    @DETDB                        FPA        ASTROM
-
-PSASTRO.INPUT.CMP       INPUT    none.fits                     CHIP       CMP
-PSASTRO.INPUT.CMF       INPUT    none.fits                     CHIP       CMF
-
-PPSUB.INPUT             INPUT    none.fits                     FPA        IMAGE
-PPSUB.INPUT.MASK        INPUT    none.fits                     FPA        MASK
-PPSUB.INPUT.WEIGHT      INPUT    none.fits                     FPA        WEIGHT
-PPSUB.REF               INPUT    none.fits                     FPA        IMAGE
-PPSUB.REF.MASK          INPUT    none.fits                     FPA        MASK
-PPSUB.REF.WEIGHT        INPUT    none.fits                     FPA        WEIGHT
-
-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    none.fits                     CHIP       IMAGE
-
-PPARITH.INPUT.IMAGE     INPUT    none.fits                     CHIP       IMAGE
-PPARITH.INPUT.MASK      INPUT    none.fits                     CHIP       MASK
-
-### output file definitions
-TYPE                   OUTPUT FILENAME.RULE                     FILE.TYPE FITS.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT
-PPIMAGE.OUTPUT         OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     COMP_POS   CHIP      TRUE      NONE
-PPIMAGE.OUTPUT.MASK    OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits      MASK      COMP_MASK  CHIP      TRUE      NONE
-PPIMAGE.OUTPUT.WEIGHT  OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits      WEIGHT    COMP_POS   CHIP      TRUE      NONE
-PPIMAGE.OUTPUT.DETMASK OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     COMP_MASK  CHIP      TRUE      NONE
-
-PPIMAGE.CHIP.RAW       OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE     COMP_POS   CHIP      TRUE      NONE
-# PPIMAGE.CHIP.MK      OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE     COMP_MASK  CHIP      TRUE      NONE
-PPIMAGE.CHIP           OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits      IMAGE     COMP_POS   CHIP      TRUE      NONE
-PPIMAGE.CHIP.MASK      OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits   MASK      COMP_MASK  CHIP      TRUE      NONE
-PPIMAGE.CHIP.WEIGHT    OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits   WEIGHT    COMP_POS   CHIP      TRUE      NONE
-
-PPIMAGE.OUTPUT.FPA1    OUTPUT {OUTPUT}.b1.fits                  IMAGE     NONE       FPA       TRUE      NONE
-PPIMAGE.OUTPUT.FPA2    OUTPUT {OUTPUT}.b2.fits                  IMAGE     NONE       FPA       TRUE      NONE
-
-PPIMAGE.JPEG1          OUTPUT {OUTPUT}.b1.jpg                   JPEG      NONE       FPA       TRUE      NONE
-PPIMAGE.JPEG2          OUTPUT {OUTPUT}.b2.jpg                   JPEG      NONE       FPA       TRUE      NONE
-PPIMAGE.BIN1           OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits      IMAGE     NONE       CHIP      TRUE      NONE
-PPIMAGE.BIN2           OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits      IMAGE     NONE       CHIP      TRUE      NONE
-
-PPIMAGE.STATS          OUTPUT {OUTPUT}.{CHIP.NAME}.stats        STATS     NONE       CHIP      TRUE      NONE
-
-PPMERGE.OUTPUT.MASK    OUTPUT {OUTPUT}.{CHIP.NAME}.fits         MASK      NONE       CHIP      TRUE      NONE
-PPMERGE.OUTPUT.BIAS    OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP      TRUE      NONE
-PPMERGE.OUTPUT.DARK    OUTPUT {OUTPUT}.{CHIP.NAME}.fits         DARK      NONE       CHIP      TRUE      NONE
-PPMERGE.OUTPUT.SHUTTER OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP      TRUE      NONE
-PPMERGE.OUTPUT.FLAT    OUTPUT {OUTPUT}.{CHIP.NAME}.fits         IMAGE     NONE       CHIP      TRUE      NONE
-PPMERGE.OUTPUT.FRINGE  OUTPUT {OUTPUT}.{CHIP.NAME}.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.OUTPUT         OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits      IMAGE     NONE       CHIP      TRUE      NONE
-DVOFLAT.OUTPUT         OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits      IMAGE     NONE       CHIP      TRUE      NONE
-
-PSPHOT.RESID           OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits     IMAGE     COMP_SUB   CHIP      TRUE      NONE
-PSPHOT.BACKGND         OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits     IMAGE     COMP_POS   CHIP      TRUE      NONE
-PSPHOT.BACKSUB         OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits     IMAGE     COMP_SUB   CHIP      TRUE      NONE
-PSPHOT.BACKMDL         OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits     IMAGE     COMP_POS   CHIP      TRUE      NONE
-
-PSPHOT.OUTPUT.RAW      OUTPUT {OUTPUT}.{CHIP.NAME}              RAW       NONE       CHIP      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      NONE
-PSPHOT.OUT.CMF.MEF     OUTPUT {OUTPUT}.cmf                      CMF       NONE       FPA       TRUE      MEF
-
-PSPHOT.PSF.SAVE        OUTPUT {OUTPUT}.psf                      PSF       NONE       CHIP      TRUE      MEF
-
-SOURCE.PLOT.MOMENTS    OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png      KAPA      NONE       CHIP      TRUE      NONE
-SOURCE.PLOT.PSFMODEL   OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png      KAPA      NONE       CHIP      TRUE      NONE
-SOURCE.PLOT.APRESID    OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png      KAPA      NONE       CHIP      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      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_POS   FPA       TRUE      NONE
-PSWARP.OUTPUT.MASK     OUTPUT {OUTPUT}.mask.fits                MASK      COMP_MASK  FPA       TRUE      NONE
-PSWARP.OUTPUT.WEIGHT   OUTPUT {OUTPUT}.wt.fits                  WEIGHT    COMP_POS   FPA       TRUE      NONE
-PSWARP.OUTPUT.SOURCES  OUTPUT {OUTPUT}.cmf                      CMF       NONE       FPA       TRUE      NONE
-PSWARP.BIN1            OUTPUT {OUTPUT}.b1.fits                  IMAGE     NONE       FPA       TRUE      NONE
-PSWARP.BIN2            OUTPUT {OUTPUT}.b2.fits                  IMAGE     NONE       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_SUB   FPA       TRUE      NONE
-PPSUB.OUTPUT.MASK      OUTPUT {OUTPUT}.mask.fits                MASK      COMP_MASK  FPA       TRUE      NONE
-PPSUB.OUTPUT.WEIGHT    OUTPUT {OUTPUT}.wt.fits                  WEIGHT    COMP_POS   FPA       TRUE      NONE
-
-PPSTACK.OUTPUT         OUTPUT {OUTPUT}.fits                     IMAGE     COMP_POS   FPA       TRUE      NONE
-PPSTACK.OUTPUT.MASK    OUTPUT {OUTPUT}.mask.fits                MASK      COMP_MASK  FPA       TRUE      NONE
-PPSTACK.OUTPUT.WEIGHT  OUTPUT {OUTPUT}.wt.fits                  WEIGHT    COMP_POS   FPA       TRUE      NONE
-
-PPSTAMP.OUTPUT         OUTPUT {OUTPUT}.fits                     IMAGE     NONE       FPA       TRUE      NONE
-PPSTAMP.CHIP           OUTPUT {OUTPUT}.ch.fits                  IMAGE     NONE      CHIP       FALSE     MEF
-
-PPSIM.OUTPUT           OUTPUT {OUTPUT}.fits                     IMAGE     NONE       FPA       TRUE      MEF
-
-PPARITH.OUTPUT.IMAGE   OUTPUT {OUTPUT}.fits                     IMAGE     COMP_POS  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
Index: trunk/ippconfig/gpc1/psastro.config
===================================================================
--- trunk/ippconfig/gpc1/psastro.config	(revision 17472)
+++ trunk/ippconfig/gpc1/psastro.config	(revision 17523)
@@ -8,5 +8,5 @@
 # max grid offset in FP units (microns)
 # use plate-scale to make this in pixels?
-PSASTRO.GRID.OFFSET    F32    2500.
+PSASTRO.GRID.OFFSET    F32    8000.
 PSASTRO.GRID.SCALE     F32      50
 PSASTRO.GRID.NSTAR.MAX S32     800 # max stars accepted for fitting
@@ -16,5 +16,5 @@
 
 # extra field for ref stars:
-PSASTRO.FIELD.PADDING  F32     0.25
+PSASTRO.FIELD.PADDING  F32     0.25   # pad by this fraction of the full mosaic (may need to be larger for single chips)
 
 # 
Index: trunk/ippconfig/gpc1/psphot.config
===================================================================
--- trunk/ippconfig/gpc1/psphot.config	(revision 17472)
+++ trunk/ippconfig/gpc1/psphot.config	(revision 17523)
@@ -38,4 +38,5 @@
 PSF_MAX_CHI          F32  50.0		 # reject objects worse that this
 APTREND.ORDER.MAX    S32  1
+MEASURE.APTREND      BOOL  FALSE  ### XXX for now, skip this (too many errors)
 
 BREAK_POINT STR ENSEMBLE
Index: trunk/ippconfig/gpc1/pswarp.config
===================================================================
--- trunk/ippconfig/gpc1/pswarp.config	(revision 17472)
+++ trunk/ippconfig/gpc1/pswarp.config	(revision 17523)
@@ -1,1 +1,1 @@
-ASTROM.SOURCE		STR	PSASTRO.OUTPUT	# Source file rule for astrometry, or NULL
+ASTROM.SOURCE		STR	PSASTRO.OUTPUT.MEF	# Source file rule for astrometry, or NULL
