Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20080925.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20080925.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20080925.config	(revision 31439)
@@ -670,3 +670,65 @@
         XY76    STR     1111111111111111111111111111111111111111111111111111111111111111
 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    BOOL 	FALSE
+        XY10    BOOL 	FALSE
+        XY11    BOOL 	FALSE
+ 	XY12    BOOL 	FALSE
+        XY13    BOOL 	FALSE
+        XY14    BOOL 	FALSE
+        XY15    BOOL 	FALSE
+        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    BOOL 	FALSE
+        XY30    BOOL 	FALSE
+        XY31    BOOL 	FALSE
+        XY32    BOOL 	FALSE
+        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    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    BOOL 	FALSE
+        XY63    BOOL 	FALSE
+        XY64    BOOL 	FALSE
+        XY65    BOOL 	FALSE
+        XY66    BOOL 	FALSE
+        XY67    BOOL 	FALSE
+        XY71    BOOL 	FALSE
+        XY72    BOOL 	FALSE
+        XY73    BOOL 	FALSE
+        XY74    BOOL 	FALSE
+        XY75    BOOL 	FALSE
+        XY76    BOOL 	FALSE
+END
+
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20080929.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20080929.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20080929.config	(revision 31439)
@@ -666,3 +666,65 @@
         XY76    STR     1111111111111111111111111111111111111111111111111111111111111111
 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    BOOL 	FALSE
+        XY10    BOOL 	FALSE
+        XY11    BOOL 	FALSE
+ 	XY12    BOOL 	FALSE
+        XY13    BOOL 	FALSE
+        XY14    BOOL 	FALSE
+        XY15    BOOL 	FALSE
+        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    BOOL 	FALSE
+        XY30    BOOL 	FALSE
+        XY31    BOOL 	FALSE
+        XY32    BOOL 	FALSE
+        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    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    BOOL 	FALSE
+        XY63    BOOL 	FALSE
+        XY64    BOOL 	FALSE
+        XY65    BOOL 	FALSE
+        XY66    BOOL 	FALSE
+        XY67    BOOL 	FALSE
+        XY71    BOOL 	FALSE
+        XY72    BOOL 	FALSE
+        XY73    BOOL 	FALSE
+        XY74    BOOL 	FALSE
+        XY75    BOOL 	FALSE
+        XY76    BOOL 	FALSE
+END
+
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20081011.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20081011.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20081011.config	(revision 31439)
@@ -656,2 +656,64 @@
         XY76    STR     1111111111111111111111111111111111111111111111111111111111111111
 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    BOOL 	FALSE
+        XY10    BOOL 	FALSE
+        XY11    BOOL 	FALSE
+ 	XY12    BOOL 	FALSE
+        XY13    BOOL 	FALSE
+        XY14    BOOL 	FALSE
+        XY15    BOOL 	FALSE
+        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    BOOL 	FALSE
+        XY30    BOOL 	FALSE
+        XY31    BOOL 	FALSE
+        XY32    BOOL 	FALSE
+        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    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    BOOL 	FALSE
+        XY63    BOOL 	FALSE
+        XY64    BOOL 	FALSE
+        XY65    BOOL 	FALSE
+        XY66    BOOL 	FALSE
+        XY67    BOOL 	FALSE
+        XY71    BOOL 	FALSE
+        XY72    BOOL 	FALSE
+        XY73    BOOL 	FALSE
+        XY74    BOOL 	FALSE
+        XY75    BOOL 	FALSE
+        XY76    BOOL 	FALSE
+END
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20090120.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20090120.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20090120.config	(revision 31439)
@@ -588,2 +588,64 @@
         XY76    STR     1111111111111111111111111111111111111111111111111111111111111111
 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    BOOL 	FALSE
+        XY10    BOOL 	FALSE
+        XY11    BOOL 	FALSE
+ 	XY12    BOOL 	FALSE
+        XY13    BOOL 	FALSE
+        XY14    BOOL 	FALSE
+        XY15    BOOL 	FALSE
+        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    BOOL 	FALSE
+        XY30    BOOL 	FALSE
+        XY31    BOOL 	FALSE
+        XY32    BOOL 	FALSE
+        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    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    BOOL 	FALSE
+        XY63    BOOL 	FALSE
+        XY64    BOOL 	FALSE
+        XY65    BOOL 	FALSE
+        XY66    BOOL 	FALSE
+        XY67    BOOL 	FALSE
+        XY71    BOOL 	FALSE
+        XY72    BOOL 	FALSE
+        XY73    BOOL 	FALSE
+        XY74    BOOL 	FALSE
+        XY75    BOOL 	FALSE
+        XY76    BOOL 	FALSE
+END
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20090220.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20090220.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20090220.config	(revision 31439)
@@ -590,3 +590,65 @@
         XY76    STR     1111111111111111111111111111111111111111111111111111111111111111
 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    BOOL 	FALSE
+        XY10    BOOL 	FALSE
+        XY11    BOOL 	FALSE
+ 	XY12    BOOL 	FALSE
+        XY13    BOOL 	FALSE
+        XY14    BOOL 	FALSE
+        XY15    BOOL 	FALSE
+        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    BOOL 	FALSE
+        XY30    BOOL 	FALSE
+        XY31    BOOL 	FALSE
+        XY32    BOOL 	FALSE
+        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    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    BOOL 	FALSE
+        XY63    BOOL 	FALSE
+        XY64    BOOL 	FALSE
+        XY65    BOOL 	FALSE
+        XY66    BOOL 	FALSE
+        XY67    BOOL 	FALSE
+        XY71    BOOL 	FALSE
+        XY72    BOOL 	FALSE
+        XY73    BOOL 	FALSE
+        XY74    BOOL 	FALSE
+        XY75    BOOL 	FALSE
+        XY76    BOOL 	FALSE
+END
+
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20091209.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20091209.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20091209.config	(revision 31439)
@@ -527,5 +527,5 @@
 PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
 	XY01	BOOL	FALSE
-	XY02	BOOL	FALSE
+        XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -533,8 +533,8 @@
 	XY06	BOOL	FALSE
 	XY10	BOOL	FALSE
-	XY11	BOOL	FALSE
+	XY11	STR	0011100100000000000000000000000000000000000000000000000000000000
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-	XY14	BOOL	FALSE
+        XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
 	XY16	BOOL	FALSE
@@ -549,5 +549,5 @@
 	XY27	STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
 	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
+	XY31	STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
 	XY32	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
 	XY33	BOOL	FALSE
@@ -578,5 +578,5 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
+	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
@@ -595,10 +595,10 @@
 	XY04	BOOL	FALSE
 	XY05	BOOL	FALSE
-	XY06    STR     11010000000100000001101001000000000000000000000000000000000000000
+	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
 	XY10	BOOL	FALSE
 	XY11	BOOL	FALSE
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-	XY14	STR     0000000000000000000000000000000000000000000000010000000000101101
+	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
 	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
 	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100122.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100122.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100122.config	(revision 31439)
@@ -525,8 +525,10 @@
  
 
+# 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	BOOL	FALSE
+	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -534,8 +536,8 @@
 	XY06	BOOL	FALSE
 	XY10	BOOL	FALSE
-	XY11	BOOL	FALSE
+	XY11	STR	0011100100000000000000000000000000000000000000000000000000000000
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-	XY14	BOOL	FALSE
+	XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
 	XY16	BOOL	FALSE
@@ -550,5 +552,5 @@
 	XY27	STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
 	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
+	XY31	STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
 	XY32	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
 	XY33	BOOL	FALSE
@@ -579,5 +581,5 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
+	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
@@ -596,10 +598,10 @@
 	XY04	BOOL	FALSE
 	XY05	BOOL	FALSE
-	XY06    STR     11010000000100000001101001000000000000000000000000000000000000000
+	XY06    STR     1101000000010000000110100100000000000000000000000000000000000000
 	XY10	BOOL	FALSE
 	XY11	BOOL	FALSE
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-	XY14	STR     0000000000000000000000000000000000000000000000010000000000101101
+	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
 	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
 	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100228.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100228.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100228.config	(revision 31439)
@@ -529,5 +529,5 @@
 PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
 	XY01	BOOL	FALSE
-	XY02	BOOL	FALSE
+	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -535,8 +535,8 @@
 	XY06	BOOL	FALSE
 	XY10	BOOL	FALSE
-	XY11    STR	0011100100000000000000000000000000000000000000000000000000000000
+	XY11	STR	0011100100000000000000000000000000000000000000000000000000000000
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-	XY14	BOOL	FALSE
+	XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
 	XY16	BOOL	FALSE
@@ -551,5 +551,5 @@
 	XY27	STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
 	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
+	XY31	STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
 	XY32	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
 	XY33	BOOL	FALSE
@@ -580,5 +580,5 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
+	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
@@ -602,5 +602,5 @@
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-	XY14	STR     0000000000000000000000000000000000000000000000010000000000101101
+	XY14	STR     0000000000000000111111110000000000000000000000010000000000101101
 	XY15	STR     0011111100011000000001000000010000001001000111110001010000011111
 	XY16	STR     0000000100000000000000000000000000000001000000000000000000000000
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100723.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100723.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/format_20100723.config	(revision 31439)
@@ -529,5 +529,5 @@
 PATTERN.ROW.SUBSET	METADATA	# List of chips and whether to do row pattern correction
 	XY01	BOOL	FALSE
-	XY02	BOOL	FALSE
+	XY02	STR     0000000000000000000000000000000000000000000000000000000000000001 # xy77
 	XY03	BOOL	FALSE
 	XY04	BOOL	FALSE
@@ -538,5 +538,5 @@
 	XY12	BOOL	FALSE
 	XY13	BOOL	FALSE
-	XY14	BOOL	FALSE
+	XY14	STR     0000000000000000000100000000000000000000000000000000000000000000 # xy23
 	XY15	STR     1111111100000000000000000000000000000000000000000000000000000000 # cols: 0
 	XY16	BOOL	FALSE
@@ -551,5 +551,5 @@
 	XY27	STR     1111111111111111111111111111111100000000000000000000000011111111 # cols: 0,1,2,3,7
 	XY30	BOOL	FALSE
-	XY31	BOOL	FALSE
+	XY31	STR     0000000000000000000000000000000000000000000000000000000011111111 # cols: 7
 	XY32	STR     0000000000000000000000001111111100000000000000000000000011111111 # cols: 3,7
 	XY33	BOOL	FALSE
@@ -580,5 +580,5 @@
 	XY64	BOOL	FALSE
 	XY65	BOOL	FALSE
-	XY66	BOOL	FALSE
+	XY66	STR	0000000000000000000000000000000000000000000000000000000000000100 # cell xy75
 	XY67	BOOL	FALSE
 	XY71	BOOL	FALSE
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/ppImage.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/ppImage.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/ppImage.config	(revision 31439)
@@ -222,4 +222,5 @@
        FILTER   STR FPA.FILTERID
      END
+  END
 END
  
Index: branches/eam_branches/ipp-20110404/ippconfig/gpc1/psastro.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/gpc1/psastro.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/gpc1/psastro.config	(revision 31439)
@@ -16,6 +16,6 @@
 PSASTRO.GRID.SCALE     F32      50
 PSASTRO.GRID.NSTAR.MAX S32     800 # deprecated 
-PSASTRO.GRID.NREF.MAX  S32     800 # max stars accepted for fitting from ref catalog
-PSASTRO.GRID.NRAW.MAX  S32    1200 # max stars accepted for fitting from raw image
+PSASTRO.GRID.NREF.MAX  S32     800 # max stars accepted for grid search from ref catalog
+PSASTRO.GRID.NRAW.MAX  S32    1200 # max stars accepted for grid search from raw image
 
 PSASTRO.MAX.NRAW      S32      1000   # max stars accepted for fitting (0 for all)
@@ -28,4 +28,6 @@
 PSASTRO.MIN.INST.MAG.RAW       F32     -15.0   # min instrumental magnitude for stars accepted for fitting
 PSASTRO.MAX.INST.MAG.RAW       F32      -8.0   # max instrumental magnitude for stars accepted for fitting
+PSASTRO.GRID.MIN.INST.MAG.RAW  F32     -15.0   # min instrumental magnitude for stars accepted for grid search
+PSASTRO.GRID.MAX.INST.MAG.RAW  F32      -8.0   # max instrumental magnitude for stars accepted for grid search
 
 PSASTRO.GRID.MIN.ANGLE F32 -1.0 # start angle (degrees)
@@ -314,7 +316,16 @@
   # allow more stars per chip and boost the density to which we query
   # from the reference database.
-  PSASTRO.MAX.NRAW      S32      2000   # 
-  PSASTRO.MAX.NREF      S32      8000   # max stars accepted for fitting (0 for all)
-  DVO.GETSTAR.MAX.RHO   F32      60000.0
+  PSASTRO.MAX.NRAW               S32      2000   # 
+  PSASTRO.MAX.NREF               S32      8000   # max stars accepted for fitting (0 for all)
+  # use wider range of magnitudes for grid search
+  PSASTRO.GRID.MIN.INST.MAG.RAW  F32     -15.0   # min instrumental magnitude for stars accepted for fitting
+  PSASTRO.GRID.MAX.INST.MAG.RAW  F32     -11.0   # max instrumental magnitude for stars accepted for fitting
+
+  # reduce the magnitude range to avoid the bright stars have bad astrometry problem
+  PSASTRO.MIN.INST.MAG.RAW       F32     -12.0   # min instrumental magnitude for stars accepted for fitting
+  PSASTRO.MAX.INST.MAG.RAW       F32     -11.0   # min instrumental magnitude for stars accepted for fitting
+
+  DVO.GETSTAR.MIN.MAG.INST   F32     -15.0
+  DVO.GETSTAR.MAX.RHO        F32      60000.0
   
   # the crowding is high, so unless we restrict somewhat tightly early
@@ -324,5 +335,5 @@
 
   # single-chip radius match in pixels
-  PSASTRO.MATCH.RADIUS.N0 F32    10
+  PSASTRO.MATCH.RADIUS.N0 F32   10
   PSASTRO.MATCH.RADIUS.N1 F32    5
   PSASTRO.MATCH.RADIUS.N2 F32    5
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/dqStatsTool.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/dqStatsTool.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/dqStatsTool.config	(revision 31439)
@@ -15,167 +15,166 @@
 # echo "select zpt_obs,fwhm_major,deteff from camProcessedExp JOIN camRun USING (cam_id) JOIN chipRun USING(chip_id) JOIN rawExp USING(exp_id) WHERE camRun.label LIKE '%.nightlyscience' AND quality = 0 AND filter = 'FILTER';" | sed 's/FILTER/g.00000/' | mysql -h ippdb01 -u ipp -pipp gpc1 | awk '{print($3)}' | grep -v deteff | grep -v NULL | mk_cdf.pl | awk '{print($2,$1)}' | spline - `echo 0.0 0.05 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 0.99 1.0`
 # CZW: 2011-03-10 We've been off the sky too much to get much new science data. I've added the ThreePi.136 reprocessing to this to help gri
-    RULE METADATA
-    	COLNAME STR DETEFF
-	RULETYPE STR CDF
-	FILTER  STR g.00000
-        CDF00   F32 20.199000
-        CDF05   F32 21.471400
-        CDF10   F32 21.725000
-        CDF15   F32 21.857800
-        CDF20   F32 21.918700
-        CDF25   F32 21.976500
-        CDF30   F32 22.020800
-        CDF35   F32 22.062900
-        CDF40   F32 22.104200
-        CDF45   F32 22.136400
-        CDF50   F32 22.173500
-        CDF55   F32 22.210900
-        CDF60   F32 22.243500
-        CDF65   F32 22.280600
-        CDF70   F32 22.317500
-        CDF75   F32 22.360300
-        CDF80   F32 22.405100
-        CDF85   F32 22.453400
-        CDF90   F32 22.508500
-        CDF95   F32 22.575100
-        CDF99   F32 22.715100
+# CZW: 2011-05-04 Updated values. 
+    RULE METADATA
+        COLNAME STR DETEFF
+        RULETYPE STR CDF
+        FILTER  STR g.00000
+        CDF00   F32 19.245000
+        CDF05   F32 21.519900
+        CDF10   F32 21.705100
+        CDF15   F32 21.831400
+        CDF20   F32 21.901700
+        CDF25   F32 21.961500
+        CDF30   F32 22.009200
+        CDF35   F32 22.049700
+        CDF40   F32 22.085100
+        CDF45   F32 22.126400
+        CDF50   F32 22.161100
+        CDF55   F32 22.196100
+        CDF60   F32 22.230600
+        CDF65   F32 22.261400
+        CDF70   F32 22.294200
+        CDF75   F32 22.332200
+        CDF80   F32 22.372500
+        CDF85   F32 22.421000
+        CDF90   F32 22.471900
+        CDF95   F32 22.540200
+        CDF99   F32 22.657600
         CDF100  F32 22.992000
     END
     RULE METADATA
-    	COLNAME STR DETEFF
-	RULETYPE STR CDF
-	FILTER  STR r.00000
+        COLNAME STR DETEFF
+        RULETYPE STR CDF
+        FILTER  STR r.00000
         CDF00   F32 16.424200
-        CDF05   F32 20.942300
-        CDF10   F32 21.219600
-        CDF15   F32 21.432500
-        CDF20   F32 21.605300
-        CDF25   F32 21.731400
-        CDF30   F32 21.803200
-        CDF35   F32 21.890000
-        CDF40   F32 21.954700
-        CDF45   F32 22.006200
-        CDF50   F32 22.052200
-        CDF55   F32 22.098400
-        CDF60   F32 22.132500
-        CDF65   F32 22.163900
-        CDF70   F32 22.198400
-        CDF75   F32 22.229200
-        CDF80   F32 22.267200
-        CDF85   F32 22.307500
-        CDF90   F32 22.356100
-        CDF95   F32 22.419900
-        CDF99   F32 22.555900
+        CDF05   F32 21.111400
+        CDF10   F32 21.317500
+        CDF15   F32 21.472400
+        CDF20   F32 21.615500
+        CDF25   F32 21.711900
+        CDF30   F32 21.789700
+        CDF35   F32 21.846100
+        CDF40   F32 21.898400
+        CDF45   F32 21.945800
+        CDF50   F32 21.989500
+        CDF55   F32 22.034000
+        CDF60   F32 22.075800
+        CDF65   F32 22.116800
+        CDF70   F32 22.152700
+        CDF75   F32 22.189200
+        CDF80   F32 22.230300
+        CDF85   F32 22.271900
+        CDF90   F32 22.329200
+        CDF95   F32 22.394500
+        CDF99   F32 22.532000
         CDF100  F32 22.870400
     END
     RULE METADATA
-    	COLNAME STR DETEFF
-	RULETYPE STR CDF
-	FILTER  STR i.00000
+        COLNAME STR DETEFF
+        RULETYPE STR CDF
+        FILTER  STR i.00000
         CDF00   F32 15.811400
-        CDF05   F32 20.082600
-        CDF10   F32 20.829900
-        CDF15   F32 21.044500
-        CDF20   F32 21.163700
-        CDF25   F32 21.256500
-        CDF30   F32 21.343700
-        CDF35   F32 21.412300
-        CDF40   F32 21.474900
-        CDF45   F32 21.533000
-        CDF50   F32 21.593000
-        CDF55   F32 21.658700
-        CDF60   F32 21.734000
-        CDF65   F32 21.790500
-        CDF70   F32 21.861200
-        CDF75   F32 21.927400
-        CDF80   F32 22.004800
-        CDF85   F32 22.103500
-        CDF90   F32 22.238100
-        CDF95   F32 22.378100
-        CDF99   F32 22.489700
+        CDF05   F32 20.490100
+        CDF10   F32 21.001400
+        CDF15   F32 21.176500
+        CDF20   F32 21.286300
+        CDF25   F32 21.368800
+        CDF30   F32 21.437400
+        CDF35   F32 21.509900
+        CDF40   F32 21.572000
+        CDF45   F32 21.629900
+        CDF50   F32 21.697600
+        CDF55   F32 21.756500
+        CDF60   F32 21.809000
+        CDF65   F32 21.857300
+        CDF70   F32 21.907200
+        CDF75   F32 21.951700
+        CDF80   F32 22.006600
+        CDF85   F32 22.070800
+        CDF90   F32 22.162300
+        CDF95   F32 22.323700
+        CDF99   F32 22.476700
         CDF100  F32 22.892300
     END
-# Updated with somewhat questionable values due to low numbers of zy data.
-    RULE METADATA
-    	COLNAME STR DETEFF
-	RULETYPE STR CDF
-	FILTER  STR z.00000
+    RULE METADATA
+        COLNAME STR DETEFF
+        RULETYPE STR CDF
+        FILTER  STR z.00000
         CDF00   F32 14.759100
-        CDF05   F32 17.486900
-        CDF10   F32 18.923700
-        CDF15   F32 19.383900
-        CDF20   F32 19.760100
-        CDF25   F32 19.950600
-        CDF30   F32 20.097300
-        CDF35   F32 20.203800
-        CDF40   F32 20.286700
-        CDF45   F32 20.377800
-        CDF50   F32 20.455000
-        CDF55   F32 20.527300
-        CDF60   F32 20.621800
-        CDF65   F32 20.713000
-        CDF70   F32 20.787700
-        CDF75   F32 20.884300
-        CDF80   F32 21.027100
-        CDF85   F32 21.183500
-        CDF90   F32 21.275500
-        CDF95   F32 21.383300
-        CDF99   F32 21.577900
-        CDF100  F32 21.670700
-    END
-    RULE METADATA
-    	COLNAME STR DETEFF
-	RULETYPE STR CDF
-	FILTER  STR y.00000
+        CDF05   F32 18.965400
+        CDF10   F32 19.733200
+        CDF15   F32 20.050200
+        CDF20   F32 20.224400
+        CDF25   F32 20.317200
+        CDF30   F32 20.403300
+        CDF35   F32 20.491200
+        CDF40   F32 20.581900
+        CDF45   F32 20.656000
+        CDF50   F32 20.720000
+        CDF55   F32 20.778800
+        CDF60   F32 20.843400
+        CDF65   F32 20.916000
+        CDF70   F32 20.998600
+        CDF75   F32 21.093300
+        CDF80   F32 21.182900
+        CDF85   F32 21.242400
+        CDF90   F32 21.297500
+        CDF95   F32 21.383500
+        CDF99   F32 21.553000
+        CDF100  F32 21.701800
+    END
+    RULE METADATA
+        COLNAME STR DETEFF
+        RULETYPE STR CDF
+        FILTER  STR y.00000
         CDF00   F32 14.606500
-        CDF05   F32 17.436900
-        CDF10   F32 18.090700
-        CDF15   F32 18.350700
-        CDF20   F32 18.549300
-        CDF25   F32 18.727300
-        CDF30   F32 18.934300
-        CDF35   F32 19.140200
-        CDF40   F32 19.294800
-        CDF45   F32 19.400400
-        CDF50   F32 19.493000
-        CDF55   F32 19.564800
-        CDF60   F32 19.665600
-        CDF65   F32 19.744900
-        CDF70   F32 19.821300
-        CDF75   F32 19.900400
-        CDF80   F32 20.005400
-        CDF85   F32 20.087600
-        CDF90   F32 20.148200
-        CDF95   F32 20.220300
-        CDF99   F32 20.365800
+        CDF05   F32 17.858300
+        CDF10   F32 18.328600
+        CDF15   F32 18.584100
+        CDF20   F32 18.870500
+        CDF25   F32 19.100900
+        CDF30   F32 19.237800
+        CDF35   F32 19.339200
+        CDF40   F32 19.407300
+        CDF45   F32 19.473800
+        CDF50   F32 19.541000
+        CDF55   F32 19.608900
+        CDF60   F32 19.682500
+        CDF65   F32 19.743900
+        CDF70   F32 19.811100
+        CDF75   F32 19.899000
+        CDF80   F32 20.011200
+        CDF85   F32 20.089600
+        CDF90   F32 20.148100
+        CDF95   F32 20.221100
+        CDF99   F32 20.340000
         CDF100  F32 20.594900
     END
-# Not updated on 2011-03-28 due to insufficient w data.
-    RULE METADATA
-    	COLNAME STR DETEFF
-	RULETYPE STR CDF
-	FILTER  STR w.00000
-	CDF00   F32 17.4082
-	CDF05   F32 19.4333
-	CDF10   F32 19.9698
-	CDF15   F32 20.2711
-	CDF20   F32 20.3919
-	CDF25   F32 20.5038
-	CDF30   F32 20.6192
-	CDF35   F32 20.7273
-	CDF40   F32 20.8184
-	CDF45   F32 20.9186
-	CDF50   F32 21.0151
-	CDF55   F32 21.1326
-	CDF60   F32 21.2442
-	CDF65   F32 21.3412
-	CDF70   F32 21.4394
-	CDF75   F32 21.5105
-	CDF80   F32 21.5567
-	CDF85   F32 21.6281
-	CDF90   F32 21.6908
-	CDF95   F32 21.7566
-	CDF99   F32 21.8907
-	CDF100  F32 23.6312
+    RULE METADATA
+        COLNAME STR DETEFF
+        RULETYPE STR CDF
+        FILTER  STR w.00000
+        CDF00   F32 21.986000
+        CDF05   F32 21.990000
+        CDF10   F32 22.056500
+        CDF15   F32 22.097000
+        CDF20   F32 22.145000
+        CDF25   F32 22.186500
+        CDF30   F32 22.209500
+        CDF35   F32 22.286500
+        CDF40   F32 22.339800
+        CDF45   F32 22.385200
+        CDF50   F32 22.413200
+        CDF55   F32 22.506700
+        CDF60   F32 22.554200
+        CDF65   F32 22.587100
+        CDF70   F32 22.594200
+        CDF75   F32 22.616800
+        CDF80   F32 22.688200
+        CDF85   F32 22.723000
+        CDF90   F32 22.765800
+        CDF95   F32 22.891600
+        CDF99   F32 22.964500
+        CDF100  F32 22.977000
     END
     RULE METADATA
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-mef.mdc
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-mef.mdc	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-mef.mdc	(revision 31439)
@@ -225,4 +225,8 @@
 PSPHOT.PSF.RAW.SAVE     OUTPUT {OUTPUT}.psf                      PSF       NONE       CHIP       TRUE      MEF
 PSPHOT.PSF.SKY.SAVE     OUTPUT {OUTPUT}.psf                      PSF       NONE       CHIP       TRUE      MEF
+
+# used by staticsky with single input
+PSPHOT.SKY.CONFIG       OUTPUT {OUTPUT}.psphot.mdc               TEXT      NONE       FPA        TRUE      NONE
+
                                                                                      
 # outputs for psphotStack:
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-simple.mdc
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-simple.mdc	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-simple.mdc	(revision 31439)
@@ -193,4 +193,7 @@
 PSPHOT.PSF.RAW.SAVE          OUTPUT {OUTPUT}.psf                  PSF             NONE       FPA        TRUE      NONE
 PSPHOT.PSF.SKY.SAVE          OUTPUT {OUTPUT}.psf                  PSF             NONE       FPA        TRUE      NONE
+
+# used by staticsky with single input
+PSPHOT.SKY.CONFIG       OUTPUT {OUTPUT}.psphot.mdc               TEXT      NONE       FPA        TRUE      NONE
 
 # outputs for psphotStack:
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-split.mdc
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-split.mdc	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/filerules-split.mdc	(revision 31439)
@@ -211,4 +211,7 @@
 PSPHOT.PSF.RAW.SAVE          OUTPUT {OUTPUT}.{CHIP.NAME}.psf          PSF             NONE       CHIP       TRUE      MEF
 PSPHOT.PSF.SKY.SAVE          OUTPUT {OUTPUT}.psf                      PSF             NONE       FPA        TRUE      MEF
+
+# used by staticsky with single input
+PSPHOT.SKY.CONFIG       OUTPUT {OUTPUT}.psphot.mdc               TEXT      NONE       FPA        TRUE      NONE
                                                                                                               
 # outputs for psphotStack:
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/nightly_science.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/nightly_science.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/nightly_science.config	(revision 31439)
@@ -22,5 +22,5 @@
 CLEAN_MODES METADATA
   MODE           STR MAGICDS
-  COMMAND        STR magicdstool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@
+  COMMAND        STR magicdstool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -state full -set_label goto_cleaned -label @LABEL@ -data_group @DATA_GROUP@
   RETENTION_TIME S16 2
 END
@@ -203,9 +203,13 @@
   NAME      STR STS
   DISTRIBUTION STR STS
-  TESS      STR STS
+  # XXX: STS observations are temporarily being taken outside the STS tessellation
+  # switch tess_id from STS.V3 to RINGS
+  TESS      STR RINGS.V3
+  # TESS      STR STS.V3
   OBSMODE   STR STS%
   OBJECT    STR STS%
   STACKABLE BOOL FALSE
   DIFFABLE  BOOL FALSE
+  REDUCTION STR STS_DATASET
 END
 TARGETS METADATA
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/ppStack.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/ppStack.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/ppStack.config	(revision 31439)
@@ -97,4 +97,6 @@
 OUTPUT.REPLICATE BOOL   TRUE
 
+STACK.TYPE      STR     DEEP_STACK
+
 # Recipe overrides for STACK
 STACK	METADATA
@@ -123,4 +125,10 @@
 END
 
+QUICKSTACK    METADATA
+        CONVOLVE        BOOL   FALSE
+	COMBINE.REJ     F32    3.0
+        COMBINE.DISCARD F32    0.3
+        MASK.VAL	STR    MASK.VALUE,CONV.BAD,GHOST,BURNTOOL # Mask value of input bad pixels
+END
 
 # 
@@ -130,4 +138,5 @@
 
 STACK_NIGHTLY  METADATA
+    STACK.TYPE      STR     NIGHTLY_STACK
 END
 
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/ppSub.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/ppSub.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/ppSub.config	(revision 31439)
@@ -76,4 +76,6 @@
 INVERSE		BOOL	FALSE		# Generate inverse subtraction?
 PHOTOMETRY	BOOL	FALSE		# Perform photometry?
+NOCONVOLVE      BOOL    FALSE           # Skip convolution?
+
 
 FORCED.PHOTOMETRY.BOTH BOOL FALSE       # forced photometry on input sources?
@@ -141,4 +143,42 @@
  FORCED.PHOTOMETRY.BOTH BOOL    TRUE    # forced photometry on input sources
 END
+
+# Difference of warp - quickstack
+WARPQSTACK	METADATA
+	DUAL		BOOL	TRUE	# Dual convolution?
+	INVERSE		BOOL	FALSE	# Generate inverse subtraction?
+	PHOTOMETRY	BOOL	TRUE	# Perform photometry?
+
+	# penalty of 1.0
+	# DUAL convolution is more sensitive to the number of kernels
+	# do not provide as many orders as for SINGLE
+        # @ISIS.WIDTHS	F32	2.4  5.0  10.0  # Gaussian kernel FWHM values
+	@ISIS.WIDTHS	F32	1.5  3.0  6.0   # Gaussian kernel FWHM values
+	# @ISIS.WIDTHS	F32	2.0  3.0  5.0   # Gaussian kernel FWHM values
+        # @ISIS.WIDTHS	F32	2.1  4.2  8.4   # Gaussian kernel FWHM values
+	@ISIS.ORDERS	S32	2    2    2     # Polynomial orders for ISIS kernels
+
+	SCALE.REF	F32     5.0		# FWHM reference for kernel parameter scaling
+	KERNEL.SIZE     S32	15		# Kernel half-size (pixels)
+	STAMP.FOOTPRINT S32	15		# Size of stamps (pixels)
+END
+
+# Do no convolution
+UNCONVOLVED	METADATA
+	DUAL		BOOL	FALSE	# Dual convolution?
+	INVERSE		BOOL	FALSE   # Generate inverse subtraction?
+	PHOTOMETRY	BOOL	FALSE	# Perform photometry?
+	NOCONVOLVE      BOOL    TRUE
+	CONVOLVE.TARGET STR     SINGLE2	# convolution direction
+END
+
+# Difference of warp - junkstack
+WARPJSTACK      METADATA
+	DUAL		BOOL	FALSE	# Dual convolution?
+	INVERSE		BOOL	FALSE   # Generate inverse subtraction?
+	PHOTOMETRY	BOOL	TRUE	# Perform photometry?
+	CONVOLVE.TARGET STR     SINGLE1	# convolution direction
+END
+
 
 #PR image class
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/psastro.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/psastro.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/psastro.config	(revision 31439)
@@ -83,4 +83,6 @@
 PSASTRO.MIN.INST.MAG.RAW       F32      0.0   # min instrumental magnitude for stars accepted for fitting
 PSASTRO.MAX.INST.MAG.RAW       F32      0.0   # max instrumental magnitude for stars accepted for fitting
+PSASTRO.GRID.MIN.INST.MAG.RAW       F32      0.0   # min instrumental magnitude for stars accepted for grid search
+PSASTRO.GRID.MAX.INST.MAG.RAW       F32      0.0   # max instrumental magnitude for stars accepted for grid search
 
 PSASTRO.MATCH.LUMFUNC  BOOL     FALSE
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/psphot.config
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/psphot.config	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/psphot.config	(revision 31439)
@@ -203,18 +203,18 @@
 
 # define the annuli (in pixels) for surface brightness measurements
-# @RADIAL.ANNULAR.BINS.LOWER           F32     0.0   5.0  10.0  20.0  40.0  80.0
-# @RADIAL.ANNULAR.BINS.UPPER           F32     5.0  10.0  20.0  40.0  80.0 160.0
+# @RADIAL.ANNULAR.BINS.LOWER           F32     0.0   5.0  10.0  20.0  40.0  80.0 # comment due to ticket #1476
+# @RADIAL.ANNULAR.BINS.UPPER           F32     5.0  10.0  20.0  40.0  80.0 160.0 #
 
 # SDSS values (in SDSS pixels)
-#@RADIAL.ANNULAR.BINS.LOWER           F32     0.00 0.56 1.69 2.59 4.41  7.51 11.58 18.58 28.55 45.50  70.51 110.53 172.49 269.52 420.51
-#@RADIAL.ANNULAR.BINS.UPPER           F32     0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 652.50
+#@RADIAL.ANNULAR.BINS.LOWER           F32     0.00 0.56 1.69 2.59 4.41  7.51 11.58 18.58 28.55 45.50  70.51 110.53 172.49 269.52 420.51 #
+#@RADIAL.ANNULAR.BINS.UPPER           F32     0.56 1.69 2.59 4.41 7.51 11.58 18.58 28.55 45.50 70.51 110.53 172.49 269.52 420.51 652.50 #
 
 # PS1 values? (all SDSS @ PS1 0.2 arcsec pixel scales)
-# @RADIAL.ANNULAR.BINS.LOWER           F32      0.0 1.2 3.4 5.2  8.8 15.0 23.2 37.2 57.1  91.0 141.0 221.1 345.0 539.1  841.0
-# @RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 345.0 539.1 841.0 1305.0
+# @RADIAL.ANNULAR.BINS.LOWER           F32      0.0 1.2 3.4 5.2  8.8 15.0 23.2 37.2 57.1  91.0 141.0 221.1 345.0 539.1  841.0 #
+# @RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 345.0 539.1 841.0 1305.0 #
 
 # PS1 values?
-@RADIAL.ANNULAR.BINS.LOWER           F32      0.0 1.2 3.4 5.2  8.8 15.0 23.2 37.2 57.1  91.0 141.0 
-@RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1 
+@RADIAL.ANNULAR.BINS.LOWER           F32      0.0 1.2 3.4 5.2  8.8 15.0 23.2 37.2 57.1  91.0 141.0  # perl parser fails without a comment ticket #1476
+@RADIAL.ANNULAR.BINS.UPPER           F32      1.2 3.4 5.2 8.8 15.0 23.2 37.2 57.1 91.0 141.0 221.1  # perl parser fails without a comment ticket #1476
 
 # Extended source fit parameters
@@ -431,4 +431,9 @@
 END
 
+STACKPHOT_SINGLE    METADATA
+  PSPHOT.STACK.USE.RAW                BOOL  F   # since false perform photometry & morphology analysis on the convolved images
+  SAVE.BACKMDL                        BOOL  F
+END
+
 # Recipe overrides for CHIP
 CHIP	METADATA
Index: branches/eam_branches/ipp-20110404/ippconfig/recipes/reductionClasses.mdc
===================================================================
--- branches/eam_branches/ipp-20110404/ippconfig/recipes/reductionClasses.mdc	(revision 31393)
+++ branches/eam_branches/ipp-20110404/ippconfig/recipes/reductionClasses.mdc	(revision 31439)
@@ -160,4 +160,5 @@
 	STACKPHOT_PPSUB   STR     STACKPHOT
 	STACKPHOT_PPSTACK STR     STACKPHOT
+	STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
 	BACKGROUND_PPBACKGROUND	STR	BACKGROUND
 	BACKGROUND_PSWARP	STR	BACKGROUND
@@ -178,5 +179,7 @@
 	ADDSTAR		STR	ADDSTAR
 	PSASTRO		STR     DEFAULT_RECIPE
-	STACKPHOT       STR     STACKPHOT
+	STACKPHOT_PSPHOT  STR     STACKPHOT
+	STACKPHOT_PPSUB   STR     STACKPHOT
+	STACKPHOT_PPSTACK STR     STACKPHOT
  	BACKGROUND_PPBACKGROUND	STR	BACKGROUND
  	BACKGROUND_PSWARP	STR	BACKGROUND
@@ -210,4 +213,18 @@
 STACKSTACK	METADATA
 	DIFF_PPSUB	STR	STACKSTACK
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+END
+
+WARPQSTACK	METADATA
+	DIFF_PPSUB	STR	WARPQSTACK
+	DIFF_PSPHOT	STR	DIFF
+	JPEG_BIN1	STR	PPIMAGE_J1
+	JPEG_BIN2	STR	PPIMAGE_J2
+END
+
+NOCONVDIFF	METADATA
+	DIFF_PPSUB	STR	UNCONVOLVED
 	DIFF_PSPHOT	STR	DIFF
 	JPEG_BIN1	STR	PPIMAGE_J1
@@ -237,4 +254,11 @@
 END
 
+# quick stacks
+QUICKSTACK            METADATA
+      STACK_PPSTACK   STR      QUICKSTACK
+      STACK_PPSUB     STR      STACK
+      STACK_PSPHOT    STR      STACK
+END
+
 # basic science analysis
 PHOTFEST.SINGLE1	METADATA
@@ -339,4 +363,5 @@
 	STACKPHOT_PPSUB   STR     STACKPHOT
 	STACKPHOT_PPSTACK STR     STACKPHOT
+	STACKPHOT_SINGLE_PSPHOT  STR     STACKPHOT_SINGLE
 END
 
@@ -630,2 +655,19 @@
 END
 
+STS_DATASET METADATA
+   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 STS_DATASET
+   STACKPHOT       STR     STACKPHOT
+END
+
