Index: branches/tap_branches/ippconfig/recipes/reductionClasses.mdc
===================================================================
--- branches/tap_branches/ippconfig/recipes/reductionClasses.mdc	(revision 25900)
+++ branches/tap_branches/ippconfig/recipes/reductionClasses.mdc	(revision 27835)
@@ -38,12 +38,12 @@
 
 	# *** premask (unmasked) flat-field types
-	FLAT_PREMASK_PROCESS	STR	PPIMAGE_FLATPROC_PREMASK
-	FLAT_PREMASK_RESID	STR	PPIMAGE_F
-	FLAT_PREMASK_VERIFY	STR	PPIMAGE_F
-	FLAT_PREMASK_STACK	STR	PPMERGE_FLAT
-	FLAT_PREMASK_JPEG_IMAGE	STR	FLAT
-	FLAT_PREMASK_JPEG_RESID	STR	FLAT_RESID
-
-	DOMEFLAT_PREMASK_PROCESS	STR	PPIMAGE_OBDS
+	FLAT_PREMASK_PROCESS		STR	PPIMAGE_FLATPROC_PREMASK
+	FLAT_PREMASK_RESID		STR	PPIMAGE_F
+	FLAT_PREMASK_VERIFY		STR	PPIMAGE_F
+	FLAT_PREMASK_STACK		STR	PPMERGE_FLAT
+	FLAT_PREMASK_JPEG_IMAGE		STR	FLAT
+	FLAT_PREMASK_JPEG_RESID		STR	FLAT_RESID
+
+	DOMEFLAT_PREMASK_PROCESS	STR	PPIMAGE_FLATPROC_PREMASK 
 	DOMEFLAT_PREMASK_RESID		STR	PPIMAGE_F
 	DOMEFLAT_PREMASK_VERIFY		STR	PPIMAGE_F
@@ -52,5 +52,5 @@
 	DOMEFLAT_PREMASK_JPEG_RESID	STR	FLAT_RESID
 
-	SKYFLAT_PREMASK_PROCESS		STR	PPIMAGE_OBDS
+	SKYFLAT_PREMASK_PROCESS		STR	PPIMAGE_FLATPROC_PREMASK
 	SKYFLAT_PREMASK_RESID		STR	PPIMAGE_F
 	SKYFLAT_PREMASK_VERIFY		STR	PPIMAGE_F
@@ -81,4 +81,13 @@
 	SKYFLAT_RAW_JPEG_RESID	STR	FLAT_RESID
 
+	SKYFLATTEST_RAW_PROCESS     STR     PPIMAGE_OBD	
+        SKYFLATTEST_RAW_RESID       STR     PPIMAGE_F
+        SKYFLATTEST_RAW_VERIFY      STR     PPIMAGE_F                 
+        SKYFLATTEST_RAW_STACK       STR     PPMERGE_FLAT
+        SKYFLATTEST_RAW_JPEG_IMAGE  STR     FLAT
+        SKYFLATTEST_RAW_JPEG_RESID  STR     FLAT_RESID     
+
+
+
 	# *** Standard flat-field types
 	FLAT_PROCESS		STR	PPIMAGE_OBDS
@@ -150,36 +159,70 @@
 END
 
+# No background removal
+PRESERVE_BG	METADATA
+	CHIP_PPIMAGE	STR	CHIP_PRESERVE_BG
+	CHIP_PSPHOT	STR	CHIP
+	WARP_PSWARP	STR	WARP
+	STACK_PPSTACK	STR	STACK
+	STACK_PPSUB	STR	STACK
+	STACK_PSPHOT	STR	STACK
+	DIFF_PPSUB	STR	DIFF
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+	FAKEPHOT	STR	FAKEPHOT
+	ADDSTAR		STR	ADDSTAR
+	PSASTRO		STR	DEFAULT_RECIPE
+END
+
+# basic science analysis
+MAGICTEST.V0		METADATA
+	CHIP_PPIMAGE	STR	CHIP_NOPATTERN
+	CHIP_PSPHOT	STR	CHIP
+	WARP_PSWARP	STR	WARP
+	STACK_PPSTACK	STR	STACK
+	STACK_PPSUB	STR	STACK
+	STACK_PSPHOT	STR	STACK
+	DIFF_PPSUB	STR	DIFF
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+	FAKEPHOT	STR	FAKEPHOT
+	ADDSTAR		STR	ADDSTAR
+	PSASTRO		STR	DEFAULT_RECIPE
+END
+
 # basic science analysis
 STDSCIENCE_V0	METADATA
-	CHIP_PPIMAGE	STR	TILTY
-	CHIP_PSPHOT	STR	CHIP
-	WARP_PSWARP	STR	WARP
-	STACK_PPSTACK	STR	STACK
-	STACK_PPSUB	STR	STACK
-	STACK_PSPHOT	STR	STACK
-	DIFF_PPSUB	STR	DIFF
-	DIFF_PSPHOT	STR	DIFF
-	JPEG_BIN1	STR	PPIMAGE_J1
-	JPEG_BIN2	STR	PPIMAGE_J2
-	FAKEPHOT	STR	FAKEPHOT
-	ADDSTAR		STR	ADDSTAR
-	PSASTRO		STR	DEFAULT_RECIPE
-END
-
-# basic science analysis : test of GPC1 with noisemap & no tiltystreak
+	CHIP_PPIMAGE	STR	CHIP_PATTERN
+	CHIP_PSPHOT	STR	CHIP
+	WARP_PSWARP	STR	WARP
+	STACK_PPSTACK	STR	STACK
+	STACK_PPSUB	STR	STACK
+	STACK_PSPHOT	STR	STACK
+	DIFF_PPSUB	STR	DIFF
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+	FAKEPHOT	STR	FAKEPHOT
+	ADDSTAR		STR	ADDSTAR
+	PSASTRO		STR	DEFAULT_RECIPE
+END
+
+# basic science analysis : test of GPC1 with alternate ZP analysis
 STDSCIENCE_T0	METADATA
-	CHIP_PPIMAGE	STR	NOISY
-	CHIP_PSPHOT	STR	CHIP
-	WARP_PSWARP	STR	WARP
-	STACK_PPSTACK	STR	STACK
-	STACK_PPSUB	STR	STACK
-	STACK_PSPHOT	STR	STACK
-	DIFF_PPSUB	STR	DIFF
-	DIFF_PSPHOT	STR	DIFF
-	JPEG_BIN1	STR	PPIMAGE_J1
-	JPEG_BIN2	STR	PPIMAGE_J2
-	FAKEPHOT	STR	FAKEPHOT
-	ADDSTAR		STR	ADDSTAR
-	PSASTRO		STR	DEFAULT_RECIPE
+	CHIP_PPIMAGE	STR	CHIP
+	CHIP_PSPHOT	STR	CHIP
+	WARP_PSWARP	STR	WARP
+	STACK_PPSTACK	STR	STACK
+	STACK_PPSUB	STR	STACK
+	STACK_PSPHOT	STR	STACK
+	DIFF_PPSUB	STR	DIFF
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+	FAKEPHOT	STR	FAKEPHOT
+	ADDSTAR		STR	ADDSTAR
+	PSASTRO		STR	ZPTEST
 END
 
@@ -337,4 +380,20 @@
 END
 
+PR_NOPATTERN	METADATA
+	CHIP_PPIMAGE  	STR	PR_NOPATTERN
+	CHIP_PSPHOT	STR	PR
+	WARP_PSWARP	STR	PR
+	STACK_PPSTACK	STR	PR
+	STACK_PPSUB	STR	PR
+	STACK_PSPHOT	STR	PR
+	DIFF_PPSUB	STR	DIFF
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+	FAKEPHOT	STR	FAKEPHOT
+	ADDSTAR		STR	ADDSTAR
+	PSASTRO		STR	PR_RECIPE
+END
+
 # Testing pattern subtraction
 TEST_PATTERN	METADATA