Index: trunk/ippconfig/mosaic2/camera.config
===================================================================
--- trunk/ippconfig/mosaic2/camera.config	(revision 17398)
+++ 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
