Index: branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20090220.config
===================================================================
--- branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20090220.config	(revision 33631)
+++ branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20090220.config	(revision 33638)
@@ -590,4 +590,6 @@
         XY76    STR     1111111111111111111111111111111111111111111111111111111111111111
 END
+PATTERN.CELL    BOOL    FALSE
+PATTERN.CONTINUITY BOOL TRUE
 PATTERN.CELL.SUBSET      METADATA        # List of chips and whether to do cell pattern correction  
         XY01    BOOL 	FALSE
Index: branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20091209.config
===================================================================
--- branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20091209.config	(revision 33631)
+++ branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20091209.config	(revision 33638)
@@ -525,7 +525,135 @@
 
 # PATTERN.ROW		BOOL 	TRUE	# Do any row pattern correction at all?
+# PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
+# 	XY01	BOOL	FALSE
+#         XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# 	XY06	BOOL	FALSE
+# 	XY10	BOOL	FALSE
+# 	XY11	STR	0011100100000000000000000000000000000000000000000000000000000000
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+#         XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+# 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
+# 	XY16	BOOL	FALSE
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# 	XY24	BOOL	FALSE
+# 	XY25	BOOL	FALSE
+# 	XY26	BOOL	FALSE
+# 	XY27	STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
+# 	XY30	BOOL	FALSE
+# 	XY31	STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
+# 	XY32	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+# 	XY33	BOOL	FALSE
+# 	XY34	BOOL	FALSE
+# 	XY35	BOOL	FALSE
+# 	XY36	BOOL	FALSE
+# 	XY37	BOOL	FALSE
+# 	XY40	BOOL	FALSE
+# 	XY41	BOOL	FALSE
+# 	XY42	BOOL	FALSE
+# 	XY43	BOOL	FALSE
+# 	XY44	BOOL	FALSE
+# 	XY45	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+# 	XY46	BOOL	FALSE
+# 	XY47	STR     1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	STR     1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7
+# 	XY60	STR	0000000000000000000000000000000000000000000001000000000000000000 # cell xy55
+# 	XY61	BOOL	FALSE
+# 	XY62	BOOL	FALSE
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# 	XY72	BOOL	FALSE
+# 	XY73	BOOL	FALSE
+# 	XY74	STR     0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
+
+# # PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	BOOL	FALSE
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# 	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
+# 	XY10	BOOL	FALSE
+# 	XY11	BOOL	FALSE
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
+# 	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
+# 	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# 	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
+# 	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
+# 	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
+# 	XY27	BOOL	FALSE
+# 	XY30	BOOL	FALSE
+# 	XY31	BOOL	FALSE
+# 	XY32	BOOL	FALSE
+# 	XY33	BOOL	FALSE
+# 	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
+# 	XY35	BOOL	FALSE
+# 	XY36	STR     0000000000000000000000000000000000010000000000000000000000000000
+# 	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110
+# 	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
+# 	XY41	BOOL	FALSE
+# 	XY42	BOOL	FALSE
+# 	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
+# 	XY44	BOOL	FALSE
+# 	XY45	BOOL	FALSE
+# 	XY46	BOOL	FALSE
+# 	XY47	BOOL	FALSE
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	BOOL	FALSE
+# 	XY60	BOOL	FALSE
+# 	XY61	BOOL	FALSE
+# 	XY62	STR     0000000000000000000000000000000000001000000000000000000100001010
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	BOOL	FALSE
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# 	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
+# 	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
+# 	XY74	BOOL	FALSE
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
+# PATTERN.ROW		BOOL 	TRUE	# Do any row pattern correction at all?
 PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
 	XY01	BOOL	FALSE
-        XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+	XY02	BOOL	FALSE
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -536,5 +664,5 @@
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-        XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+	XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
 	XY16	BOOL	FALSE
@@ -578,5 +706,6 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+	XY66	BOOL	FALSE
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
@@ -588,65 +717,82 @@
 END
 
-# PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
-	XY01	BOOL	FALSE
-	XY02	BOOL	FALSE
-	XY03	BOOL	FALSE
-	XY04	BOOL	FALSE
-	XY05	BOOL	FALSE
-	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-	XY10	BOOL	FALSE
-	XY11	BOOL	FALSE
-	XY12	BOOL	FALSE
-	XY13	BOOL	FALSE
-	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
-	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
-	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
-	XY17	BOOL	FALSE
-	XY20	BOOL	FALSE
-	XY21	BOOL	FALSE
-	XY22	BOOL	FALSE
-	XY23	BOOL	FALSE
-	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
-	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
-	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
-	XY27	BOOL	FALSE
-	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
-	XY32	BOOL	FALSE
-	XY33	BOOL	FALSE
-	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
-	XY35	BOOL	FALSE
-	XY36	STR     0000000000000000000000000000000000010000000000000000000000000000
-	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110
-	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
-	XY41	BOOL	FALSE
-	XY42	BOOL	FALSE
-	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
-	XY44	BOOL	FALSE
-	XY45	BOOL	FALSE
-	XY46	BOOL	FALSE
-	XY47	BOOL	FALSE
-	XY50	BOOL	FALSE
-	XY51	BOOL	FALSE
-	XY52	BOOL	FALSE
-	XY53	BOOL	FALSE
-	XY54	BOOL	FALSE
-	XY55	BOOL	FALSE
-	XY56	BOOL	FALSE
-	XY57	BOOL	FALSE
-	XY60	BOOL	FALSE
-	XY61	BOOL	FALSE
-	XY62	STR     0000000000000000000000000000000000001000000000000000000100001010
-	XY63	BOOL	FALSE
-	XY64	BOOL	FALSE
-	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
-	XY67	BOOL	FALSE
-	XY71	BOOL	FALSE
-	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
-	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
-	XY74	BOOL	FALSE
-	XY75	BOOL	FALSE
-	XY76	BOOL	FALSE
-END
+PATTERN.CELL    BOOL   FALSE
+PATTERN.CONTINUITY BOOL TRUE
+
+# # PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	BOOL	FALSE
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# #	XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+# 	XY06	BOOL	FALSE
+# 	XY10	BOOL	FALSE
+# 	XY11	BOOL	FALSE
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000111111110000000000000000000000000000000000000000
+# 	XY15	STR     1111111110000000100000000000000000000000000000000000000000000000
+# #	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
+# 	XY16	BOOL	FALSE
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# #	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
+# 	XY24	BOOL	FALSE
+# #	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
+# 	XY25	BOOL	FALSE
+# #	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
+# 	XY26	BOOL	FALSE
+# 	XY27	BOOL	FALSE
+# 	XY30	BOOL	FALSE
+# 	XY31	BOOL	FALSE
+# 	XY32	BOOL	FALSE
+# 	XY33	BOOL	FALSE
+# #	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
+# 	XY34	BOOL	FALSE
+# 	XY35	BOOL	FALSE
+# #	XY36	STR     0001000000000000000000000000000000010000000000000000000000000000
+# 	XY36	BOOL	FALSE
+# #	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+# 	XY37	BOOL	FALSE
+# #	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
+# 	XY40	BOOL	FALSE
+# 	XY41	BOOL	FALSE
+# #	XY42	BOOL	FALSE
+# 	XY42	STR	0000000000000000000100000001000000000000000000000000000000000000
+# #	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
+# 	XY43	STR 	0000000000000000000000000000000000000000000010000000000000000000
+# 	XY44	BOOL	FALSE
+# 	XY45	BOOL	FALSE
+# 	XY46	BOOL	FALSE
+# 	XY47	BOOL	FALSE
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	BOOL	FALSE
+# 	XY60	BOOL	FALSE
+# 	XY61	BOOL	FALSE
+# #	XY62	STR     0000000000000000000000000000000000000000000000000000000000000010
+# 	XY62	BOOL	FALSE
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	BOOL	FALSE
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# #	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
+# 	XY72	BOOL	FALSE
+# #	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
+# 	XY73	BOOL	FALSE
+# 	XY74	BOOL	FALSE
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
Index: branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100122.config
===================================================================
--- branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100122.config	(revision 33631)
+++ branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100122.config	(revision 33638)
@@ -527,8 +527,136 @@
 # Pattern correction information:
 
+# # PATTERN.ROW		BOOL 	TRUE	# Do any row pattern correction at all?
+# PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# 	XY06	BOOL	FALSE
+# 	XY10	BOOL	FALSE
+# 	XY11	STR	0011100100000000000000000000000000000000000000000000000000000000
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+# 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
+# 	XY16	BOOL	FALSE
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# 	XY24	BOOL	FALSE
+# 	XY25	BOOL	FALSE
+# 	XY26	BOOL	FALSE
+# 	XY27	STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
+# 	XY30	BOOL	FALSE
+# 	XY31	STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
+# 	XY32	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+# 	XY33	BOOL	FALSE
+# 	XY34	BOOL	FALSE
+# 	XY35	BOOL	FALSE
+# 	XY36	BOOL	FALSE
+# 	XY37	BOOL	FALSE
+# 	XY40	BOOL	FALSE
+# 	XY41	BOOL	FALSE
+# 	XY42	BOOL	FALSE
+# 	XY43	BOOL	FALSE
+# 	XY44	BOOL	FALSE
+# 	XY45	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+# 	XY46	BOOL	FALSE
+# 	XY47	STR     1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	STR     1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7
+# 	XY60	STR	0000000000000000000000000000000000000000000001000000000000000000 # cell xy55
+# 	XY61	BOOL	FALSE
+# 	XY62	BOOL	FALSE
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# 	XY72	BOOL	FALSE
+# 	XY73	BOOL	FALSE
+# 	XY74	STR     0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
+
+# # PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	BOOL	FALSE
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# 	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
+# 	XY10	BOOL	FALSE
+# 	XY11	BOOL	FALSE
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
+# 	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
+# 	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# 	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
+# 	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
+# 	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
+# 	XY27	BOOL	FALSE
+# 	XY30	BOOL	FALSE
+# 	XY31	BOOL	FALSE
+# 	XY32	BOOL	FALSE
+# 	XY33	BOOL	FALSE
+# 	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
+# 	XY35	BOOL	FALSE
+# 	XY36	STR     0000000000000000000000000000000000010000000000000000000000000000
+# 	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110
+# 	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
+# 	XY41	BOOL	FALSE
+# 	XY42	BOOL	FALSE
+# 	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
+# 	XY44	BOOL	FALSE
+# 	XY45	BOOL	FALSE
+# 	XY46	BOOL	FALSE
+# 	XY47	BOOL	FALSE
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	BOOL	FALSE
+# 	XY60	BOOL	FALSE
+# 	XY61	BOOL	FALSE
+# 	XY62	STR     0000000000000000000000000000000000001000000000000000000100001010
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	BOOL	FALSE
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# 	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
+# 	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
+# 	XY74	BOOL	FALSE
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
 # PATTERN.ROW		BOOL 	TRUE	# Do any row pattern correction at all?
 PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
 	XY01	BOOL	FALSE
-	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+	XY02	BOOL	FALSE
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -581,5 +709,6 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+	XY66	BOOL	FALSE
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
@@ -591,65 +720,82 @@
 END
 
-# PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
-	XY01	BOOL	FALSE
-	XY02	BOOL	FALSE
-	XY03	BOOL	FALSE
-	XY04	BOOL	FALSE
-	XY05	BOOL	FALSE
-	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-	XY10	BOOL	FALSE
-	XY11	BOOL	FALSE
-	XY12	BOOL	FALSE
-	XY13	BOOL	FALSE
-	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
-	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
-	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
-	XY17	BOOL	FALSE
-	XY20	BOOL	FALSE
-	XY21	BOOL	FALSE
-	XY22	BOOL	FALSE
-	XY23	BOOL	FALSE
-	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
-	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
-	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
-	XY27	BOOL	FALSE
-	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
-	XY32	BOOL	FALSE
-	XY33	BOOL	FALSE
-	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
-	XY35	BOOL	FALSE
-	XY36	STR     0000000000000000000000000000000000010000000000000000000000000000
-	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110
-	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
-	XY41	BOOL	FALSE
-	XY42	BOOL	FALSE
-	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
-	XY44	BOOL	FALSE
-	XY45	BOOL	FALSE
-	XY46	BOOL	FALSE
-	XY47	BOOL	FALSE
-	XY50	BOOL	FALSE
-	XY51	BOOL	FALSE
-	XY52	BOOL	FALSE
-	XY53	BOOL	FALSE
-	XY54	BOOL	FALSE
-	XY55	BOOL	FALSE
-	XY56	BOOL	FALSE
-	XY57	BOOL	FALSE
-	XY60	BOOL	FALSE
-	XY61	BOOL	FALSE
-	XY62	STR     0000000000000000000000000000000000001000000000000000000100001010
-	XY63	BOOL	FALSE
-	XY64	BOOL	FALSE
-	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
-	XY67	BOOL	FALSE
-	XY71	BOOL	FALSE
-	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
-	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
-	XY74	BOOL	FALSE
-	XY75	BOOL	FALSE
-	XY76	BOOL	FALSE
-END
+PATTERN.CELL BOOL FALSE
+PATTERN.CONTINUITY BOOL TRUE
+
+# # PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	BOOL	FALSE
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# #	XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+# 	XY06	BOOL	FALSE
+# 	XY10	BOOL	FALSE
+# 	XY11	BOOL	FALSE
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000111111110000000000000000000000000000000000000000
+# 	XY15	STR     1111111110000000100000000000000000000000000000000000000000000000
+# #	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
+# 	XY16	BOOL	FALSE
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# #	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
+# 	XY24	BOOL	FALSE
+# #	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
+# 	XY25	BOOL	FALSE
+# #	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
+# 	XY26	BOOL	FALSE
+# 	XY27	BOOL	FALSE
+# 	XY30	BOOL	FALSE
+# 	XY31	BOOL	FALSE
+# 	XY32	BOOL	FALSE
+# 	XY33	BOOL	FALSE
+# #	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
+# 	XY34	BOOL	FALSE
+# 	XY35	BOOL	FALSE
+# #	XY36	STR     0001000000000000000000000000000000010000000000000000000000000000
+# 	XY36	BOOL	FALSE
+# #	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+# 	XY37	BOOL	FALSE
+# #	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
+# 	XY40	BOOL	FALSE
+# 	XY41	BOOL	FALSE
+# #	XY42	BOOL	FALSE
+# 	XY42	STR	0000000000000000000100000001000000000000000000000000000000000000
+# #	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
+# 	XY43	STR 	0000000000000000000000000000000000000000000010000000000000000000
+# 	XY44	BOOL	FALSE
+# 	XY45	BOOL	FALSE
+# 	XY46	BOOL	FALSE
+# 	XY47	BOOL	FALSE
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	BOOL	FALSE
+# 	XY60	BOOL	FALSE
+# 	XY61	BOOL	FALSE
+# #	XY62	STR     0000000000000000000000000000000000000000000000000000000000000010
+# 	XY62	BOOL	FALSE
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	BOOL	FALSE
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# #	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
+# 	XY72	BOOL	FALSE
+# #	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
+# 	XY73	BOOL	FALSE
+# 	XY74	BOOL	FALSE
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
Index: branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100228.config
===================================================================
--- branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100228.config	(revision 33631)
+++ branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100228.config	(revision 33638)
@@ -526,8 +526,136 @@
 # Pattern correction information:
 
+# # PATTERN.ROW		BOOL 	TRUE	# Do any row pattern correction at all?
+# PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# 	XY06	BOOL	FALSE
+# 	XY10	BOOL	FALSE
+# 	XY11	STR	0011100100000000000000000000000000000000000000000000000000000000
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
+# 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
+# 	XY16	BOOL	FALSE
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# 	XY24	BOOL	FALSE
+# 	XY25	BOOL	FALSE
+# 	XY26	BOOL	FALSE
+# 	XY27	STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
+# 	XY30	BOOL	FALSE
+# 	XY31	STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
+# 	XY32	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+# 	XY33	BOOL	FALSE
+# 	XY34	BOOL	FALSE
+# 	XY35	BOOL	FALSE
+# 	XY36	BOOL	FALSE
+# 	XY37	BOOL	FALSE
+# 	XY40	BOOL	FALSE
+# 	XY41	BOOL	FALSE
+# 	XY42	BOOL	FALSE
+# 	XY43	BOOL	FALSE
+# 	XY44	BOOL	FALSE
+# 	XY45	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
+# 	XY46	BOOL	FALSE
+# 	XY47	STR     1111111100000000000000001111111100000000111111110000000011111111 # cols: 0,3,5,7
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	STR     1111111111111111111111110000000000000000000000001111111111111111 # cols: 0,1,2,6,7
+# 	XY60	STR	0000000000000000000000000000000000000000000001000000000000000000 # cell xy55
+# 	XY61	BOOL	FALSE
+# 	XY62	BOOL	FALSE
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# 	XY72	BOOL	FALSE
+# 	XY73	BOOL	FALSE
+# 	XY74	STR     0000000000000000111111110000000000000000000000000000000011111111 # cols: 2,7
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
+
+# # PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	BOOL	FALSE
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# 	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
+# 	XY10	BOOL	FALSE
+# 	XY11	BOOL	FALSE
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
+# 	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
+# 	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# 	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
+# 	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
+# 	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
+# 	XY27	BOOL	FALSE
+# 	XY30	BOOL	FALSE
+# 	XY31	BOOL	FALSE
+# 	XY32	BOOL	FALSE
+# 	XY33	BOOL	FALSE
+# 	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
+# 	XY35	BOOL	FALSE
+# 	XY36	STR     0000000000000000000000000000000000010000000000000000000000000000
+# 	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110
+# 	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
+# 	XY41	BOOL	FALSE
+# 	XY42	BOOL	FALSE
+# 	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
+# 	XY44	BOOL	FALSE
+# 	XY45	BOOL	FALSE
+# 	XY46	BOOL	FALSE
+# 	XY47	BOOL	FALSE
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	BOOL	FALSE
+# 	XY60	BOOL	FALSE
+# 	XY61	BOOL	FALSE
+# 	XY62	STR     0000000000000000000000000000000000001000000000000000000100001010
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	BOOL	FALSE
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# 	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
+# 	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
+# 	XY74	BOOL	FALSE
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
 # PATTERN.ROW		BOOL 	TRUE	# Do any row pattern correction at all?
 PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
 	XY01	BOOL	FALSE
-	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+	XY02	BOOL	FALSE
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -580,5 +708,6 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+	XY66	BOOL	FALSE
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
@@ -590,65 +719,82 @@
 END
 
+PATTERN.CELL BOOL FALSE
+PATTERN.CONTINUITY BOOL TRUE
+
 # PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
-	XY01	BOOL	FALSE
-	XY02	BOOL	FALSE
-	XY03	BOOL	FALSE
-	XY04	BOOL	FALSE
-	XY05	BOOL	FALSE
-	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-	XY10	BOOL	FALSE
-	XY11	BOOL	FALSE
-	XY12	BOOL	FALSE
-	XY13	BOOL	FALSE
-	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
-	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
-	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
-	XY17	BOOL	FALSE
-	XY20	BOOL	FALSE
-	XY21	BOOL	FALSE
-	XY22	BOOL	FALSE
-	XY23	BOOL	FALSE
-	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
-	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
-	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
-	XY27	BOOL	FALSE
-	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
-	XY32	BOOL	FALSE
-	XY33	BOOL	FALSE
-	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
-	XY35	BOOL	FALSE
-	XY36	STR     0000000000000000000000000000000000010000000000000000000000000000
-	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110
-	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
-	XY41	BOOL	FALSE
-	XY42	BOOL	FALSE
-	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
-	XY44	BOOL	FALSE
-	XY45	BOOL	FALSE
-	XY46	BOOL	FALSE
-	XY47	BOOL	FALSE
-	XY50	BOOL	FALSE
-	XY51	BOOL	FALSE
-	XY52	BOOL	FALSE
-	XY53	BOOL	FALSE
-	XY54	BOOL	FALSE
-	XY55	BOOL	FALSE
-	XY56	BOOL	FALSE
-	XY57	BOOL	FALSE
-	XY60	BOOL	FALSE
-	XY61	BOOL	FALSE
-	XY62	STR     0000000000000000000000000000000000001000000000000000000100001010
-	XY63	BOOL	FALSE
-	XY64	BOOL	FALSE
-	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
-	XY67	BOOL	FALSE
-	XY71	BOOL	FALSE
-	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
-	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
-	XY74	BOOL	FALSE
-	XY75	BOOL	FALSE
-	XY76	BOOL	FALSE
-END
+# PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	BOOL	FALSE
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# #	XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+# 	XY06	BOOL	FALSE
+# 	XY10	BOOL	FALSE
+# 	XY11	BOOL	FALSE
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000111111110000000000000000000000000000000000000000
+# 	XY15	STR     1111111110000000100000000000000000000000000000000000000000000000
+# #	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
+# 	XY16	BOOL	FALSE
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# #	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
+# 	XY24	BOOL	FALSE
+# #	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
+# 	XY25	BOOL	FALSE
+# #	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
+# 	XY26	BOOL	FALSE
+# 	XY27	BOOL	FALSE
+# 	XY30	BOOL	FALSE
+# 	XY31	BOOL	FALSE
+# 	XY32	BOOL	FALSE
+# 	XY33	BOOL	FALSE
+# #	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
+# 	XY34	BOOL	FALSE
+# 	XY35	BOOL	FALSE
+# #	XY36	STR     0001000000000000000000000000000000010000000000000000000000000000
+# 	XY36	BOOL	FALSE
+# #	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+# 	XY37	BOOL	FALSE
+# #	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
+# 	XY40	BOOL	FALSE
+# 	XY41	BOOL	FALSE
+# #	XY42	BOOL	FALSE
+# 	XY42	STR	0000000000000000000100000001000000000000000000000000000000000000
+# #	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
+# 	XY43	STR 	0000000000000000000000000000000000000000000010000000000000000000
+# 	XY44	BOOL	FALSE
+# 	XY45	BOOL	FALSE
+# 	XY46	BOOL	FALSE
+# 	XY47	BOOL	FALSE
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	BOOL	FALSE
+# 	XY60	BOOL	FALSE
+# 	XY61	BOOL	FALSE
+# #	XY62	STR     0000000000000000000000000000000000000000000000000000000000000010
+# 	XY62	BOOL	FALSE
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	BOOL	FALSE
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# #	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
+# 	XY72	BOOL	FALSE
+# #	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
+# 	XY73	BOOL	FALSE
+# 	XY74	BOOL	FALSE
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
Index: branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100723.config
===================================================================
--- branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100723.config	(revision 33631)
+++ branches/eam_branches/ipp-20111122/ippconfig/gpc1/format_20100723.config	(revision 33638)
@@ -529,5 +529,6 @@
 PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
 	XY01	BOOL	FALSE
-	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+#	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
+	XY02	BOOL	FALSE
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -580,5 +581,6 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+#	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
+	XY66	BOOL	FALSE
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
@@ -590,65 +592,80 @@
 END
 
-# PATTERN.CELL	BOOL 	TRUE		# by default, do not do any cell pattern correction
-PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
-	XY01	BOOL	FALSE
-	XY02	BOOL	FALSE
-	XY03	BOOL	FALSE
-	XY04	BOOL	FALSE
-	XY05	BOOL	FALSE
-	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
-	XY10	BOOL	FALSE
-	XY11	BOOL	FALSE
-	XY12	BOOL	FALSE
-	XY13	BOOL	FALSE
-	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
-	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
-	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
-	XY17	BOOL	FALSE
-	XY20	BOOL	FALSE
-	XY21	BOOL	FALSE
-	XY22	BOOL	FALSE
-	XY23	BOOL	FALSE
-	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
-	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
-	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
-	XY27	BOOL	FALSE
-	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
-	XY32	BOOL	FALSE
-	XY33	BOOL	FALSE
-	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
-	XY35	BOOL	FALSE
-	XY36	STR     0000000000000000000000000000000000010000000000000000000000000000
-	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110
-	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
-	XY41	BOOL	FALSE
-	XY42	BOOL	FALSE
-	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
-	XY44	BOOL	FALSE
-	XY45	BOOL	FALSE
-	XY46	BOOL	FALSE
-	XY47	BOOL	FALSE
-	XY50	BOOL	FALSE
-	XY51	BOOL	FALSE
-	XY52	BOOL	FALSE
-	XY53	BOOL	FALSE
-	XY54	BOOL	FALSE
-	XY55	BOOL	FALSE
-	XY56	BOOL	FALSE
-	XY57	BOOL	FALSE
-	XY60	BOOL	FALSE
-	XY61	BOOL	FALSE
-	XY62	STR     0000000000000000000000000000000000001000000000000000000100001010
-	XY63	BOOL	FALSE
-	XY64	BOOL	FALSE
-	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
-	XY67	BOOL	FALSE
-	XY71	BOOL	FALSE
-	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
-	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
-	XY74	BOOL	FALSE
-	XY75	BOOL	FALSE
-	XY76	BOOL	FALSE
-END
+PATTERN.CONTINUITY BOOL TRUE
+ PATTERN.CELL	BOOL 	FALSE		# by default, do not do any cell pattern correction
+# PATTERN.CELL.SUBSET	METADATA	# List of chips and whether to do cell pattern correction
+# 	XY01	BOOL	FALSE
+# 	XY02	BOOL	FALSE
+# 	XY03	BOOL	FALSE
+# 	XY04	BOOL	FALSE
+# 	XY05	BOOL	FALSE
+# #	XY06    STR     0101000000010000000110000100000000000000000000000000000000000000
+# 	XY06	BOOL	FALSE
+# 	XY10	BOOL	FALSE
+# 	XY11	BOOL	FALSE
+# 	XY12	BOOL	FALSE
+# 	XY13	BOOL	FALSE
+# 	XY14	STR     0000000000000000111111110000000000000000000000000000000000000000
+# 	XY15	STR     1111111110000000100000000000000000000000000000000000000000000000
+# #	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
+# 	XY16	BOOL	FALSE
+# 	XY17	BOOL	FALSE
+# 	XY20	BOOL	FALSE
+# 	XY21	BOOL	FALSE
+# 	XY22	BOOL	FALSE
+# 	XY23	BOOL	FALSE
+# #	XY24	STR     0000000000100000000000000110100000100000001000000011100000000000
+# 	XY24	BOOL	FALSE
+# #	XY25	STR     0100010000001001001011000000001000000111000110000000100000000010
+# 	XY25	BOOL	FALSE
+# #	XY26	STR     0000000000000100000000000000000000001000001000000000000000000000
+# 	XY26	BOOL	FALSE
+# 	XY27	BOOL	FALSE
+# 	XY30	BOOL	FALSE
+# 	XY31	BOOL	FALSE
+# 	XY32	BOOL	FALSE
+# 	XY33	BOOL	FALSE
+# #	XY34	STR     0000000000000000000000000000000000000001000011000000101000111111
+# 	XY34	BOOL	FALSE
+# 	XY35	BOOL	FALSE
+# #	XY36	STR     0001000000000000000000000000000000010000000000000000000000000000
+# 	XY36	BOOL	FALSE
+# #	XY37	STR     0000000000000000000000000000000100010001000000001011000010110110 ?
+# 	XY37	BOOL	FALSE
+# #	XY40	STR     0000000000000000000000000010110000000000000001110000001000011111
+# 	XY40	BOOL	FALSE
+# 	XY41	BOOL	FALSE
+# #	XY42	BOOL	FALSE
+# 	XY42	STR	0000000000000000000100000001000000000000000000000000000000000000
+# #	XY43	STR     0000000000000000000000010000000100000000000010000100000100000100
+# 	XY43	STR 	0000000000000000000000000000000000000000000010000000000000000000
+# 	XY44	BOOL	FALSE
+# 	XY45	BOOL	FALSE
+# 	XY46	BOOL	FALSE
+# 	XY47	BOOL	FALSE
+# 	XY50	BOOL	FALSE
+# 	XY51	BOOL	FALSE
+# 	XY52	BOOL	FALSE
+# 	XY53	BOOL	FALSE
+# 	XY54	BOOL	FALSE
+# 	XY55	BOOL	FALSE
+# 	XY56	BOOL	FALSE
+# 	XY57	BOOL	FALSE
+# 	XY60	BOOL	FALSE
+# 	XY61	BOOL	FALSE
+# #	XY62	STR     0000000000000000000000000000000000000000000000000000000000000010
+# 	XY62	BOOL	FALSE
+# 	XY63	BOOL	FALSE
+# 	XY64	BOOL	FALSE
+# 	XY65	BOOL	FALSE
+# 	XY66	BOOL	FALSE
+# 	XY67	BOOL	FALSE
+# 	XY71	BOOL	FALSE
+# #	XY72	STR     0000000000000000000000000000000000000000000000000000000000000001
+# 	XY72	BOOL	FALSE
+# #	XY73	STR     0001100000000000000000000000001000000000000000000000000000000000
+# 	XY73	BOOL	FALSE
+# 	XY74	BOOL	FALSE
+# 	XY75	BOOL	FALSE
+# 	XY76	BOOL	FALSE
+# END
Index: branches/eam_branches/ipp-20111122/ippconfig/gpc1/ppImage.config
===================================================================
--- branches/eam_branches/ipp-20111122/ippconfig/gpc1/ppImage.config	(revision 33631)
+++ branches/eam_branches/ipp-20111122/ippconfig/gpc1/ppImage.config	(revision 33638)
@@ -159,4 +159,5 @@
   BIAS               BOOL    FALSE           # Bias subtraction
   DARK               BOOL    TRUE            # Dark subtraction
+  NOISEMAP	     BOOL    TRUE	     
   REMNANCE           BOOL    FALSE           # Remnance masking
   SHUTTER            BOOL    FALSE           # Shutter correction
@@ -166,5 +167,36 @@
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
   PATTERN.ROW        BOOL    TRUE            # Row pattern correction
-  PATTERN.CELL	     BOOL    TRUE	     # Cell pattern correction
+  PATTERN.CELL	     BOOL    FALSE	     # Cell pattern correction
+  PATTERN.CONTINUITY BOOL    TRUE            # Cell pattern correction using edge continuity
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+END
+
+# Chip processing for testing pattern correction
+CHIP_PATTERNTEST METADATA
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    TRUE            # apply non-linearity correction 
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  REMNANCE           BOOL    FALSE           # Remnance masking
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  MASK.BUILD	     BOOL    TRUE	     # Build internal mask?
+  MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  PATTERN.ROW        BOOL    FALSE            # Row pattern correction
+  PATTERN.CELL	     BOOL    FALSE	     # Cell pattern correction
   FRINGE             BOOL    TRUE            # Fringe subtraction
   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
@@ -196,5 +228,6 @@
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
   PATTERN.ROW        BOOL    TRUE            # Row pattern correction
-  PATTERN.CELL	     BOOL    TRUE	     # Cell pattern correction
+  PATTERN.CELL	     BOOL    FALSE	     # Cell pattern correction
+  PATTERN.CONTINUITY BOOL    TRUE
   FRINGE             BOOL    TRUE            # Fringe subtraction
   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
@@ -280,4 +313,36 @@
   END
 END
+
+CHIP_NOISEMAP METADATA
+  BASE.FITS          BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS     BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS          BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS     BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN           BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    TRUE            # apply non-linearity correction 
+  NOISEMAP	     BOOL    TRUE	     
+  BIAS               BOOL    FALSE           # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  REMNANCE           BOOL    FALSE           # Remnance masking
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  MASK.BUILD	     BOOL    TRUE	     # Build internal mask?
+  MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  PATTERN.ROW        BOOL    TRUE            # Row pattern correction
+  PATTERN.CELL	     BOOL    FALSE	     # Cell pattern correction
+  PATTERN.CONTINUITY BOOL    TRUE            # Cell pattern correction using edge continuity
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  CROSSTALK.MEASURE  BOOL    TRUE            # Subtract model background?
+END
+
  
 # Standard chip processing
@@ -1001,4 +1066,40 @@
 END
 
+PPIMAGE_NOISEMAP     METADATA
+  BASE.FITS        BOOL    TRUE            # Save base image?
+  BASE.MASK.FITS   BOOL    TRUE            # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL  TRUE            # Save base detrended image?
+  CHIP.FITS        BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL  FALSE           # Save chip-mosaic-ed image? 
+  OVERSCAN         BOOL    TRUE            # Overscan subtraction
+  NONLIN             BOOL    FALSE           # Non-linearity correction; not implemented
+  BIAS             BOOL    FALSE            # Bias subtraction
+  DARK             BOOL    FALSE            # Dark subtraction
+  SHUTTER          BOOL    FALSE           # Shutter correction
+  FLAT             BOOL    FALSE           # Flat-field normalisation
+  MASK             BOOL    FALSE           # Mask bad pixels
+  MASK.BUILD       BOOL    FALSE 	   # Build internal mask?
+  FRINGE           BOOL    FALSE           # Fringe subtraction
+  PHOTOM           BOOL    FALSE           # Source identification and photometry
+  ASTROM.CHIP      BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
+  BIN1.FITS        BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS        BOOL    TRUE            # Save 2nd binned chip image?
+  CHECK.CTE        BOOL    FALSE            # measure CTE errors?
+  CHECK.NOISE      BOOL    TRUE            # measure cell level noise.
+
+#   DETREND.CONSTRAINTS  METADATA
+#     DARK METADATA
+#       DETTYPE STR DARK_PREMASK
+#       EXPTIME STR FPA.EXPOSURE
+#     END
+#     FLAT METADATA
+#       DETTYPE STR FLAT_PREMASK
+#       FILTER  STR FPA.FILTERID
+#     END
+#   END   
+END
+
 
 PR_DARKTEST_NOSUB METADATA
@@ -1129,6 +1230,6 @@
   MASK.BUILD	     BOOL    TRUE	     # Build internal mask?
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
-  PATTERN.ROW        BOOL    FALSE           # Row pattern correction
-  PATTERN.CELL	     BOOL    FALSE	     # Cell pattern correction
+  PATTERN.ROW        BOOL    TRUE           # Row pattern correction
+  PATTERN.CELL	     BOOL    TRUE	     # Cell pattern correction
   FRINGE             BOOL    TRUE            # Fringe subtraction
   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
Index: branches/eam_branches/ipp-20111122/ippconfig/gpc1/psastro.config
===================================================================
--- branches/eam_branches/ipp-20111122/ippconfig/gpc1/psastro.config	(revision 33631)
+++ branches/eam_branches/ipp-20111122/ippconfig/gpc1/psastro.config	(revision 33638)
@@ -344,4 +344,6 @@
   PSASTRO.MATCH.RADIUS.N7 F32    5
   PSASTRO.MATCH.FIT.NITER S32    5
+
+  PSASTRO.CATDIR    	STR 	STS.PP5.REFCAT
 END