Index: /trunk/ippconfig/gpc1/camera.config
===================================================================
--- /trunk/ippconfig/gpc1/camera.config	(revision 15857)
+++ /trunk/ippconfig/gpc1/camera.config	(revision 15858)
@@ -81,9 +81,17 @@
 END
 
+# Table of strings to use for the class identifier (see ippdb) according to the file level.
+CLASSID         METADATA
+        FPA     STR     fpa
+        CHIP    STR     {CHIP.NAME}
+        CELL    STR     {CHIP.NAME}:{CELL.NAME}
+END
+
 # Recipe options
 RECIPES		METADATA
-	PPIMAGE		STR	gpc1/ppImage.config		# psphot details
-	PSASTRO		STR	gpc1/psastro.config		# psphot details
-	PSPHOT		STR	gpc1/psphot.config		# psphot details
+	PPIMAGE		STR	gpc1/ppImage.config
+	PPMERGE		STR	gpc1/ppMerge.config
+	PSASTRO		STR	gpc1/psastro.config
+	PSPHOT		STR	gpc1/psphot.config
 END
 
@@ -122,12 +130,13 @@
 		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_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
+
+		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