Index: trunk/ippconfig/gpc1/format_raw.config
===================================================================
--- trunk/ippconfig/gpc1/format_raw.config	(revision 13599)
+++ trunk/ippconfig/gpc1/format_raw.config	(revision 14560)
@@ -5,4 +5,5 @@
 #	TELESCOP	STR	PS1
 #	DETECTOR	STR	GPC1
+	CONTROLR	STR	STARGRASP
 	EXTEND		BOOL	T
 	NEXTEND		S32	64
@@ -14,6 +15,7 @@
 	PHU		STR	CHIP	# The FITS file represents a single chip
 	EXTENSIONS	STR	CELL	# The extensions represent cells
-	FPA.NAME	STR	NAMPS	# A PHU keyword for unique identifier within the hierarchy level
-	CHIP.NAME	STR	NAMPS	# An extension keyword for unique identifier
+	FPA.NAME	STR	CONTROLR      # A PHU keyword for unique identifier within the hierarchy level
+	CHIP.NAME	STR	DETECTOR      # An extension keyword for unique identifier
+	CONTENT	        STR     {CHIP.NAME}   # How to determine content of FITS file
 END
 
@@ -21,89 +23,147 @@
 CONTENTS	METADATA
 	# Extension name, type
-	xy00	STR	xy00:pitch10u
-	xy01	STR	xy01:pitch10u
-	xy02	STR	xy02:pitch10u
-	xy03	STR	xy03:pitch10u
-	xy04	STR	xy04:pitch10u
-	xy05	STR	xy05:pitch10u
-	xy06	STR	xy06:pitch10u
-	xy07	STR	xy07:pitch10u
-	xy10	STR	xy10:pitch10u
-	xy11	STR	xy11:pitch10u
-	xy12	STR	xy12:pitch10u
-	xy13	STR	xy13:pitch10u
-	xy14	STR	xy14:pitch10u
-	xy15	STR	xy15:pitch10u
-	xy16	STR	xy16:pitch10u
-	xy17	STR	xy17:pitch10u
-	xy20	STR	xy20:pitch10u
-	xy21	STR	xy21:pitch10u
-	xy22	STR	xy22:pitch10u
-	xy23	STR	xy23:pitch10u
-	xy24	STR	xy24:pitch10u
-	xy25	STR	xy25:pitch10u
-	xy26	STR	xy26:pitch10u
-	xy27	STR	xy27:pitch10u
-	xy30	STR	xy30:pitch10u
-	xy31	STR	xy31:pitch10u
-	xy32	STR	xy32:pitch10u
-	xy33	STR	xy33:pitch10u
-	xy34	STR	xy34:pitch10u
-	xy35	STR	xy35:pitch10u
-	xy36	STR	xy36:pitch10u
-	xy37	STR	xy37:pitch10u
-	xy40	STR	xy40:pitch10u
-	xy41	STR	xy41:pitch10u
-	xy42	STR	xy42:pitch10u
-	xy43	STR	xy43:pitch10u
-	xy44	STR	xy44:pitch10u
-	xy45	STR	xy45:pitch10u
-	xy46	STR	xy46:pitch10u
-	xy47	STR	xy47:pitch10u
-	xy50	STR	xy50:pitch10u
-	xy51	STR	xy51:pitch10u
-	xy52	STR	xy52:pitch10u
-	xy53	STR	xy53:pitch10u
-	xy54	STR	xy54:pitch10u
-	xy55	STR	xy55:pitch10u
-	xy56	STR	xy56:pitch10u
-	xy57	STR	xy57:pitch10u
-	xy60	STR	xy60:pitch10u
-	xy61	STR	xy61:pitch10u
-	xy62	STR	xy62:pitch10u
-	xy63	STR	xy63:pitch10u
-	xy64	STR	xy64:pitch10u
-	xy65	STR	xy65:pitch10u
-	xy66	STR	xy66:pitch10u
-	xy67	STR	xy67:pitch10u
-	xy70	STR	xy70:pitch10u
-	xy71	STR	xy71:pitch10u
-	xy72	STR	xy72:pitch10u
-	xy73	STR	xy73:pitch10u
-	xy74	STR	xy74:pitch10u
-	xy75	STR	xy75:pitch10u
-	xy76	STR	xy76:pitch10u
-	xy77	STR	xy77:pitch10u
+        CCID58-2-13a2  STR GPCChip
+        CCID58-2-01a1  STR GPCChip
+        CCID58-2-15a1  STR GPCChip
+        CCID58-1-04a1  STR GPCChip
+        CCID58-2-22a1  STR GPCChip
+        CCID58-1-12a1  STR GPCChip
+        CCID58-2-04b2  STR GPCChip
+        CCID58-1-19a1  STR GPCChip
+        CCID58-1-14a2  STR GPCChip
+        CCID58-1-02a2  STR GPCChip
+        CCID58-1-13a1  STR GPCChip
+        CCID58-1-02a1  STR GPCChip
+        CCID58-1-17a2  STR GPCChip
+        CCID58-2-01a2  STR GPCChip
+        CCID58-2-18a1  STR GPCChip
+        CCID58-2-09a2  STR GPCChip
+        CCID58-2-13b1  STR GPCChip
+        CCID58-1-01b2  STR GPCChip
+        CCID58-2-16b1  STR GPCChip
+        CCID58-1-01b1  STR GPCChip
+        CCID58-1-09a2  STR GPCChip
+        CCID58-2-04a1  STR GPCChip
+        CCID58-1-09a1  STR GPCChip
+        CCID58-1-04a2  STR GPCChip
+        CCID58-2-10b2  STR GPCChip
+        CCID58-2-16b2  STR GPCChip
+        CCID58-2-04b2  STR GPCChip
+        CCID58-1-18b1  STR GPCChip
+        CCID58-1-09b1  STR GPCChip
+        CCID58-1-02b1  STR GPCChip
+        CCID58-2-09b1  STR GPCChip
+        CCID58-2-07b2  STR GPCChip
+        CCID58-2-14a1  STR GPCChip
+        CCID58-2-07a2  STR GPCChip
+        CCID58-2-05a1  STR GPCChip
+        CCID58-1-10a2  STR GPCChip
+        CCID58-2-16a2  STR GPCChip
+        CCID58-1-21a1  STR GPCChip
+        CCID58-2-04b2  STR GPCChip
+        CCID58-2-12a1  STR GPCChip
+        CCID58-1-07a1  STR GPCChip
+        CCID58-1-05a2  STR GPCChip
+        CCID58-1-18a1  STR GPCChip
+        CCID58-2-09a1  STR GPCChip
+        CCID58-2-17a2  STR GPCChip
+        CCID58-1-21a2  STR GPCChip
+        CCID58-2-16a1  STR GPCChip
+        CCID58-2-12a2  STR GPCChip
+        CCID58-2-23b2  STR GPCChip
+        CCID58-1-07b1  STR GPCChip
+        CCID58-1-14b1  STR GPCChip
+        CCID58-1-04b1  STR GPCChip
+        CCID58-1-02b2  STR GPCChip
+        CCID58-2-11b2  STR GPCChip
+        CCID58-1-25b1  STR GPCChip
+        CCID58-1-05b2  STR GPCChip
+        CCID58-2-22b2  STR GPCChip
+        CCID58-2-18b2  STR GPCChip
+        CCID58-2-04b2  STR GPCChip
+        CCID58-1-17b1  STR GPCChip
+        CCID58-1-03b1  STR GPCChip
+        CCID58-1-03b2  STR GPCChip
+        CCID58-2-04b2  STR GPCChip
+        CCID58-2-09b2  STR GPCChip
+END
+
+CHIPS   METADATA
+	GPCChip		METADATA
+		# Extension name, cellName:cellType
+		xy00   STR  xy00:GPCCell
+		xy10   STR  xy10:GPCCell
+		xy20   STR  xy20:GPCCell
+		xy30   STR  xy30:GPCCell
+		xy40   STR  xy40:GPCCell
+		xy50   STR  xy50:GPCCell
+		xy60   STR  xy60:GPCCell
+		xy70   STR  xy70:GPCCell
+		xy01   STR  xy01:GPCCell
+		xy11   STR  xy11:GPCCell
+		xy21   STR  xy21:GPCCell
+		xy31   STR  xy31:GPCCell
+		xy41   STR  xy41:GPCCell
+		xy51   STR  xy51:GPCCell
+		xy61   STR  xy61:GPCCell
+		xy71   STR  xy71:GPCCell
+		xy02   STR  xy02:GPCCell
+		xy12   STR  xy12:GPCCell
+		xy22   STR  xy22:GPCCell
+		xy32   STR  xy32:GPCCell
+		xy42   STR  xy42:GPCCell
+		xy52   STR  xy52:GPCCell
+		xy62   STR  xy62:GPCCell
+		xy72   STR  xy72:GPCCell
+		xy03   STR  xy03:GPCCell
+		xy13   STR  xy13:GPCCell
+		xy23   STR  xy23:GPCCell
+		xy33   STR  xy33:GPCCell
+		xy43   STR  xy43:GPCCell
+		xy53   STR  xy53:GPCCell
+		xy63   STR  xy63:GPCCell
+		xy73   STR  xy73:GPCCell
+		xy04   STR  xy04:GPCCell
+		xy14   STR  xy14:GPCCell
+		xy24   STR  xy24:GPCCell
+		xy34   STR  xy34:GPCCell
+		xy44   STR  xy44:GPCCell
+		xy54   STR  xy54:GPCCell
+		xy64   STR  xy64:GPCCell
+		xy74   STR  xy74:GPCCell
+		xy05   STR  xy05:GPCCell
+		xy15   STR  xy15:GPCCell
+		xy25   STR  xy25:GPCCell
+		xy35   STR  xy35:GPCCell
+		xy45   STR  xy45:GPCCell
+		xy55   STR  xy55:GPCCell
+		xy65   STR  xy65:GPCCell
+		xy75   STR  xy75:GPCCell
+		xy06   STR  xy06:GPCCell
+		xy16   STR  xy16:GPCCell
+		xy26   STR  xy26:GPCCell
+		xy36   STR  xy36:GPCCell
+		xy46   STR  xy46:GPCCell
+		xy56   STR  xy56:GPCCell
+		xy66   STR  xy66:GPCCell
+		xy76   STR  xy76:GPCCell
+		xy07   STR  xy07:GPCCell
+		xy17   STR  xy17:GPCCell
+		xy27   STR  xy27:GPCCell
+		xy37   STR  xy37:GPCCell
+		xy47   STR  xy47:GPCCell
+		xy57   STR  xy57:GPCCell
+		xy67   STR  xy67:GPCCell
+		xy77   STR  xy77:GPCCell
+	END
 END
 
 # Specify the cell data
 CELLS	METADATA
-	pitch10u	METADATA
-		CELL.BIASSEC.SOURCE	STR	VALUE
-		CELL.TRIMSEC.SOURCE	STR	VALUE
-		CELL.BIASSEC		STR	[575:606,1:594]
-		CELL.TRIMSEC		STR	[1:574,1:594]
-	#	CELL.BIASSEC		STR	BIASSEC
-	#	CELL.TRIMSEC		STR	DATASEC
-	END
-
-	# This is just in here for fun
-	pitch12u	METADATA
-		CELL.BIASSEC.SOURCE	STR	VALUE
-		CELL.TRIMSEC.SOURCE	STR	VALUE
-		CELL.BIASSEC		STR	[1:10,1:512];[523:574,1:512]
-		CELL.TRIMSEC		STR	[11:522,1:512]
-	#	CELL.BIASSEC		STR	BIASSEC
-	#	CELL.TRIMSEC		STR	TRIMSEC
+	GPCCell		METADATA
+		CELL.TRIMSEC.SOURCE	STR	HEADER
+		CELL.TRIMSEC		STR	DATASEC
+		CELL.BIASSEC.SOURCE	STR	HEADER
+		CELL.BIASSEC		STR	BIASSEC
 	END
 END
@@ -118,9 +178,12 @@
  	CELL.XPARITY	STR	LTM1_1
 	CELL.YPARITY	STR	LTM2_2
-	CELL.SATURATION	STR	SATURATE
+#	CELL.SATURATION	STR	SATURATE
 END
 
 # Default PS concepts that may be specified by value
 DEFAULTS	METADATA
+	FPA.TELESCOPE	STR	PS1
+	FPA.INSTRUMENT	STR	GPC1
+	FPA.DETECTOR	STR	GPC1
 	FPA.AIRMASS	F32	0.0
 	FPA.FILTER	STR	NONE
@@ -130,4 +193,7 @@
 	FPA.RADECSYS	STR	ICRS
 	FPA.NAME	S32	12345
+	FPA.TIME	STR	2005-11-23T12:34:56.78
+#	FPA.TIMESYS	STR	TIMESYS
+	FPA.OBSTYPE     STR     BIAS
 	CELL.EXPOSURE	F32	0.0
 	CELL.DARKTIME	F32	0.0
@@ -138,4 +204,5 @@
 	CELL.TIMESYS	STR	UTC
 	CELL.TIME	STR	2005-11-23T12:34:56.78
+#	CELL.SATURATION	STR	60000
 END
 
