Index: trunk/ippconfig/gpc1/camera.config
===================================================================
--- trunk/ippconfig/gpc1/camera.config	(revision 15612)
+++ trunk/ippconfig/gpc1/camera.config	(revision 15616)
@@ -113,13 +113,21 @@
 		FRINGE_STACK	STR	PPMERGE_FRINGE
 
-		# Make masks from flats
-		MASK_PROCESS		STR	PPIMAGE_OBDSF
-		MASK_RESID		STR	PPIMAGE_N
-		MASK_VERIFY		STR	PPIMAGE_OBDSF
-		MASK_STACK		STR	PPMERGE_MASK
-		JPEG_BIN1_IMAGE_MASK	STR	PPIMAGE_J1_IMAGE_M
-		JPEG_BIN2_IMAGE_MASK	STR	PPIMAGE_J2_IMAGE_M
-		JPEG_BIN1_RESID_MASK	STR	PPIMAGE_J1_RESID_M
-		JPEG_BIN2_RESID_MASK	STR	PPIMAGE_J2_RESID_M
+		# 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_MASK
+		FLATMASK_PROCESS	STR	PPIMAGE_OBDSF
+		FLATMASK_RESID		STR	PPIMAGE_N
+		FLATMASK_VERIFY		STR	PPIMAGE_OBDSF
+		FLATMASK_STACK		STR	PPMERGE_MASK
+		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
 
  		JPEG_BIN1_IMAGE_BIAS     STR  PPIMAGE_J1_IMAGE_B
@@ -153,17 +161,4 @@
 		JPEG_BIN2_RESID_FRINGE   STR  PPIMAGE_J2_RESID_R
 	END
-
-	# Additional reduction prescription for generating masks from darks
-	DARKMASK	METADATA
-		MASK_PROCESS		STR	PPIMAGE_OBD
-		MASK_RESID		STR	PPIMAGE_N
-		MASK_VERIFY		STR	PPIMAGE_OBD
-		MASK_STACK		STR	PPMERGE_MASK
-		JPEG_BIN1_IMAGE_MASK	STR	PPIMAGE_J1_IMAGE_M
-		JPEG_BIN2_IMAGE_MASK	STR	PPIMAGE_J2_IMAGE_M
-		JPEG_BIN1_RESID_MASK	STR	PPIMAGE_J1_RESID_M
-		JPEG_BIN2_RESID_MASK	STR	PPIMAGE_J2_RESID_M
-	END
-
 	# Processing raw data
 	DEFAULT		METADATA