Index: /trunk/ippconfig/gpc1/format_20090220.config
===================================================================
--- /trunk/ippconfig/gpc1/format_20090220.config	(revision 24344)
+++ /trunk/ippconfig/gpc1/format_20090220.config	(revision 24345)
@@ -223,11 +223,5 @@
         CELL.TIME       STR     SHUTOUTC	# Observation time
         CELL.GAIN       STR     GAIN		# Cell gain (e/ADU)
-	### Don't have good noise measurements for these, so trust the header
-        CELL.READNOISE.DEPEND          STR     CHIP.NAME
-        CELL.READNOISE         METADATA
-          XY06  STR     RDNOISE
-          XY67  STR     RDNOISE
-          XY60  STR     RDNOISE
-	END
+        CELL.READNOISE  STR     RDNOISE		# Cell read noise (ADU)
         CELL.SATURATION STR     MAXLIN		# Saturation point (ADU)
 END
@@ -503,69 +497,4 @@
 	CELL.YSIZE	S32	598
         CELL.TIMESYS    STR     UTC
-	# We currently don't trust the RDNOISE written in the header, especially
-	# for a few noisy chips.  Using our own measurements instead.
-        CELL.READNOISE.DEPEND          STR     CHIP.NAME
-        CELL.READNOISE         METADATA
-            XY01        F32     10.691960
-            XY02        F32     9.971171
-            XY03        F32     7.436374
-            XY04        F32     7.033418
-            XY05        F32     8.065249
-###	    XY06 --- don't have a good measurement for this; trust header	    
-            XY10        F32     10.769757
-            XY11        F32     7.564246
-            XY12        F32     7.860930
-            XY13        F32     6.582859
-            XY14        F32     8.116328
-            XY15        F32     6.319167
-            XY16        F32     7.170277
-            XY17        F32     7.817622
-            XY20        F32     7.842822
-            XY21        F32     7.608591
-            XY22        F32     8.404410
-            XY23        F32     7.517746
-            XY24        F32     5.281758
-            XY25        F32     6.580110
-            XY26        F32     5.981509
-            XY27        F32     48.230743
-            XY30        F32     6.722150
-            XY31        F32     6.602553
-            XY32        F32     8.444833
-            XY33        F32     6.826778
-            XY34        F32     5.890262
-            XY35        F32     6.605969
-            XY36        F32     5.753396
-            XY37        F32     7.755778
-            XY40        F32     7.108387
-            XY41        F32     7.318987
-            XY42        F32     6.715497
-            XY43        F32     7.477917
-            XY44        F32     6.108793
-            XY45        F32     12.535511
-            XY46        F32     6.034042
-            XY47        F32     14.177100
-            XY50        F32     7.961789
-            XY51        F32     7.777806
-            XY52        F32     6.619287
-            XY53        F32     6.545637
-            XY54        F32     5.877383
-            XY55        F32     9.437126
-            XY56        F32     5.567864
-            XY57        F32     17.134941
-###	    XY60 --- don't have a good measurement for this; trust header	    
-            XY61        F32     8.733758
-            XY62        F32     9.918634
-            XY63        F32     7.349695
-            XY64        F32     6.680933
-            XY65        F32     9.773758
-            XY66        F32     5.919581
-###	    XY67 --- don't have a good measurement for this; trust header	    
-            XY71        F32     12.060068
-            XY72        F32     7.089605
-            XY73        F32     6.931761
-            XY74        F32     8.408091
-            XY75        F32     10.593745
-            XY76        F32     7.730008
-	END
 END