Index: trunk/ippScripts/scripts/detrend_norm_apply.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 19373)
+++ trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 19374)
@@ -69,10 +69,13 @@
     'dark_premask'     => 'dark',
     'shutter'  	       => 'shutter',
+    'flat_premask'     => 'flat',
+    'domeflat_premask' => 'flat',
+    'skyflat_premask'  => 'flat',
+    'flat_raw'         => 'flat',
+    'domeflat_raw'     => 'flat',
+    'skyflat_raw'      => 'flat',   
     'flat'     	       => 'flat',
     'domeflat' 	       => 'flat',
     'skyflat'  	       => 'flat',   
-    'flat_premask'     => 'flat',
-    'domeflat_premask' => 'flat',
-    'skyflat_premask'  => 'flat',
     'fringe'   	       => 'fringe',   
     'mask'     	       => 'mask',
Index: trunk/ippScripts/scripts/detrend_norm_calc.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_norm_calc.pl	(revision 19373)
+++ trunk/ippScripts/scripts/detrend_norm_calc.pl	(revision 19374)
@@ -60,10 +60,13 @@
     'dark_premask'     => 0,
     'shutter'  	       => 0,
+    'flat_premask'     => 1,
+    'domeflat_premask' => 1,
+    'skyflat_premask'  => 1,
+    'flat_raw'         => 1,
+    'domeflat_raw'     => 1,
+    'skyflat_raw'      => 1,
     'flat'     	       => 1,
     'domeflat' 	       => 1,
     'skyflat'  	       => 1,   
-    'flat_premask'     => 1,
-    'domeflat_premask' => 1,
-    'skyflat_premask'  => 1,
     'fringe'   	       => 0,   
     'mask'     	       => 0,
Index: trunk/ippScripts/scripts/detrend_resid_imfile.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_resid_imfile.pl	(revision 19373)
+++ trunk/ippScripts/scripts/detrend_resid_imfile.pl	(revision 19374)
@@ -110,10 +110,13 @@
     'dark_premask'     => '-dark',      # Specify the dark frame
     'shutter'  	       => '-shutter',   # Specify the shutter frame
+    'flat_premask'     => '-flat',      # Specify the flat frame
+    'domeflat_premask' => '-flat',      # Specify the flat frame
+    'skyflat_premask'  => '-flat',      # Specify the flat frame
+    'flat_raw'         => '-flat',      # Specify the flat frame
+    'domeflat_raw'     => '-flat',      # Specify the flat frame
+    'skyflat_raw'      => '-flat',      # Specify the flat frame
     'flat'     	       => '-flat',      # Specify the flat frame
     'domeflat' 	       => '-flat',      # Specify the flat frame
     'skyflat'  	       => '-flat',      # Specify the flat frame
-    'flat_premask'     => '-flat',      # Specify the flat frame
-    'domeflat_premask' => '-flat',      # Specify the flat frame
-    'skyflat_premask'  => '-flat',      # Specify the flat frame
     'fringe'   	       => '-fringe',    # Specify the fringe frame
     'mask'     	       => '-mask',      # Specify the mask frame
Index: trunk/ippScripts/scripts/detrend_stack.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_stack.pl	(revision 19373)
+++ trunk/ippScripts/scripts/detrend_stack.pl	(revision 19374)
@@ -90,35 +90,43 @@
 
 # The output file rule name depends on the detrend type
-my $FILERULES = { 'FLATMASK'     => 'PPMERGE.OUTPUT.MASK',
-                  'DARKMASK'     => 'PPMERGE.OUTPUT.MASK',
-                  'MASK'         => 'PPMERGE.OUTPUT.MASK',
-                  'BIAS'         => 'PPMERGE.OUTPUT.BIAS',
-                  'DARK'         => 'PPMERGE.OUTPUT.DARK',
-                  'DARK_PREMASK' => 'PPMERGE.OUTPUT.DARK',
-                  'SHUTTER'      => 'PPMERGE.OUTPUT.SHUTTER',
-                  'FLAT'         => 'PPMERGE.OUTPUT.FLAT',
-                  'FLAT_PREMASK' => 'PPMERGE.OUTPUT.FLAT',
-                  'FLAT_CORRECT' => 'PPMERGE.OUTPUT.FLAT',
-                  'DOMEFLAT'     => 'PPMERGE.OUTPUT.FLAT',
-                  'SKYFLAT'      => 'PPMERGE.OUTPUT.FLAT',
-                  'FRINGE'       => 'PPMERGE.OUTPUT.FRINGE',
+my $FILERULES = { 'FLATMASK'         => 'PPMERGE.OUTPUT.MASK',
+                  'DARKMASK'         => 'PPMERGE.OUTPUT.MASK',
+                  'MASK'             => 'PPMERGE.OUTPUT.MASK',
+                  'BIAS'             => 'PPMERGE.OUTPUT.BIAS',
+                  'DARK'             => 'PPMERGE.OUTPUT.DARK',
+                  'DARK_PREMASK'     => 'PPMERGE.OUTPUT.DARK',
+                  'SHUTTER'          => 'PPMERGE.OUTPUT.SHUTTER',
+                  'FLAT_PREMASK'     => 'PPMERGE.OUTPUT.FLAT',
+                  'DOMEFLAT_PREMASK' => 'PPMERGE.OUTPUT.FLAT',
+                  'SKYFLAT_PREMASK'  => 'PPMERGE.OUTPUT.FLAT',
+                  'FLAT_RAW'         => 'PPMERGE.OUTPUT.FLAT',
+                  'DOMEFLAT_RAW'     => 'PPMERGE.OUTPUT.FLAT',
+                  'SKYFLAT_RAW'      => 'PPMERGE.OUTPUT.FLAT',
+                  'FLAT'             => 'PPMERGE.OUTPUT.FLAT',
+                  'DOMEFLAT'         => 'PPMERGE.OUTPUT.FLAT',
+                  'SKYFLAT'          => 'PPMERGE.OUTPUT.FLAT',
+                  'FRINGE'           => 'PPMERGE.OUTPUT.FRINGE',
               };
 my $output_filerule = $FILERULES->{$det_type}; # File rule for output
 &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless defined $output_filerule;
 
-# The output file rule name depends on the detrend type
-my $STATRECIPES = { 'FLATMASK'     => 'CHIPSTATS',
-                   'DARKMASK'     => 'CHIPSTATS',
-                   'MASK'         => 'CHIPSTATS',
-                   'BIAS'         => 'CHIPSTATS',
-                   'DARK'         => 'DARKSTATS',
-                   'DARK_PREMASK' => 'DARKSTATS',
-                   'SHUTTER'      => 'DARKSTATS',
-                   'FLAT'         => 'CHIPSTATS',
-                   'FLAT_PREMASK' => 'CHIPSTATS',
-                   'FLAT_CORRECT' => 'CHIPSTATS',
-                   'DOMEFLAT'     => 'CHIPSTATS',
-                   'SKYFLAT'      => 'CHIPSTATS',
-                   'FRINGE'       => 'CHIPSTATS',
+# The stats recipe depends on the detrend type
+my $STATRECIPES = {'FLATMASK'         => 'CHIPSTATS',
+                   'DARKMASK'         => 'CHIPSTATS',
+                   'MASK'             => 'CHIPSTATS',
+                   'BIAS'             => 'CHIPSTATS',
+                   'DARK'             => 'DARKSTATS',
+                   'DARK_PREMASK'     => 'DARKSTATS',
+                   'SHUTTER'          => 'DARKSTATS',
+                   'FLAT_PREMASK'     => 'CHIPSTATS',
+                   'DOMEFLAT_PREMASK' => 'CHIPSTATS',
+                   'SKYFLAT_PREMASK'  => 'CHIPSTATS',
+                   'FLAT_RAW'         => 'CHIPSTATS',
+                   'DOMEFLAT_RAW'     => 'CHIPSTATS',
+                   'SKYFLAT_RAW'      => 'CHIPSTATS',
+                   'FLAT'             => 'CHIPSTATS',
+                   'DOMEFLAT'         => 'CHIPSTATS',
+                   'SKYFLAT'          => 'CHIPSTATS',
+                   'FRINGE'           => 'CHIPSTATS',
               };
 my $statrecipe = $STATRECIPES->{$det_type}; # File rule for output