Index: trunk/archive/scripts/src/megacam_raw.config
===================================================================
--- trunk/archive/scripts/src/megacam_raw.config	(revision 4092)
+++ trunk/archive/scripts/src/megacam_raw.config	(revision 4386)
@@ -12,51 +12,157 @@
 PHU		STR	FPA	# The FITS file represents an entire FPA
 EXTENSIONS	STR	CELL	# The extensions represent cells
-EXTENSION_KEY	STR	EXTNAME	# You get the extensions by looking at the EXTNAME header
-IDENTIFIER	STR	OBSID	# We identify the observation by the observation Id in the header
 
 # What's in the FITS file?
 CONTENTS	METADATA
 	# Extension name, chip name:type
-	amp00	STR	ccd00:science
-	amp01	STR	ccd00:science
-	amp02	STR	ccd01:science
-	amp03	STR	ccd01:science
-	guide	STR	guide:guide		# A guide CCD thrown in, just for fun
+	amp00	STR	ccd00:left
+	amp01	STR	ccd00:right
+	amp02	STR	ccd01:left
+	amp03	STR	ccd01:right
+	amp04	STR	ccd02:left
+	amp05	STR	ccd02:right
+	amp06	STR	ccd03:left
+	amp07	STR	ccd03:right
+	amp08	STR	ccd04:left
+	amp09	STR	ccd04:right
+	amp10	STR	ccd05:left
+	amp11	STR	ccd05:right
+	amp12	STR	ccd06:left
+	amp13	STR	ccd06:right
+	amp14	STR	ccd07:left
+	amp15	STR	ccd07:right
+	amp16	STR	ccd08:left
+	amp17	STR	ccd08:right
+	amp18	STR	ccd09:left
+	amp19	STR	ccd09:right
+	amp20	STR	ccd10:left
+	amp21	STR	ccd10:right
+	amp22	STR	ccd11:left
+	amp23	STR	ccd11:right
+	amp24	STR	ccd12:left
+	amp25	STR	ccd12:right
+	amp26	STR	ccd13:left
+	amp27	STR	ccd13:right
+	amp28	STR	ccd14:left
+	amp29	STR	ccd14:right
+	amp30	STR	ccd15:left
+	amp31	STR	ccd15:right
+	amp32	STR	ccd16:left
+	amp33	STR	ccd16:right
+	amp34	STR	ccd17:left
+	amp35	STR	ccd17:right
+	amp36	STR	ccd18:left
+	amp37	STR	ccd18:right
+	amp38	STR	ccd19:left
+	amp39	STR	ccd19:right
+	amp40	STR	ccd20:left
+	amp41	STR	ccd20:right
+	amp42	STR	ccd21:left
+	amp43	STR	ccd21:right
+	amp44	STR	ccd22:left
+	amp45	STR	ccd22:right
+	amp46	STR	ccd23:left
+	amp47	STR	ccd23:right
+	amp48	STR	ccd24:left
+	amp49	STR	ccd24:right
+	amp50	STR	ccd25:left
+	amp51	STR	ccd25:right
+	amp52	STR	ccd26:left
+	amp53	STR	ccd26:right
+	amp54	STR	ccd27:left
+	amp55	STR	ccd27:right
+	amp56	STR	ccd28:left
+	amp57	STR	ccd28:right
+	amp58	STR	ccd29:left
+	amp59	STR	ccd29:right
+	amp60	STR	ccd30:left
+	amp61	STR	ccd30:right
+	amp62	STR	ccd31:left
+	amp63	STR	ccd31:right
+	amp64	STR	ccd32:left
+	amp65	STR	ccd32:right
+	amp66	STR	ccd33:left
+	amp67	STR	ccd33:right
+	amp68	STR	ccd34:left
+	amp69	STR	ccd34:right
+	amp70	STR	ccd35:left
+	amp71	STR	ccd35:right
 END
 
 # Specify the cell data
 CELLS	METADATA
-	science	METADATA	# A science CCD
-		CELL.BIASSEC	STR	VALUE:[1:10,1:4096];[1035:1084,1:4096]
-		CELL.TRIMSEC	STR	VALUE:[11:1034,1:4096]
-	#	CELL.BIASSEC	STR	HEADER:BIASSEC
-	#	CELL.TRIMSEC	STR	HEADER:TRIMSEC
+	left	METADATA	# Left amplifier
+		CELL.BIASSEC	STR	HEADER:BIASSEC
+		CELL.TRIMSEC	STR	HEADER:DATASEC
+		CELL.XPARITY	S32	1	# We could have specified this as a DEFAULT, but this works
 	END
-
-	guide	METADATA	# A guide CCD
-		CELL.BIASSEC	STR	VALUE:[1:10,1:1024];[1035:1084,1:1024]
-		CELL.TRIMSEC	STR	VALUE:[11:1034,1:1024]
-	#	CELL.BIASSEC	STR	HEADER:BIASSEC
-	#	CELL.TRIMSEC	STR	HEADER:TRIMSEC
+	right	METADATA	# Right amplifier
+		CELL.BIASSEC	STR	HEADER:BIASSEC
+		CELL.TRIMSEC	STR	HEADER:DATASEC
+		CELL.XPARITY	S32	-1	# This cell is read out in the opposite direction
 	END
-		
 END
 
 # How to translate PS concepts into FITS headers
 TRANSLATION	METADATA
+	FPA.NAME	STR	EXPNUM
 	FPA.AIRMASS	STR	AIRMASS
 	FPA.FILTER	STR	FILTER
-	FPA.POSANGLE	STR	POSANG
-	FPA.RA		STR	OBJ-RA
-	FPA.DEC		STR	OBJ-DEC
-	CELL.EXPOSURE	STR	EXPOSURE
-	CELL.DARKTIME	STR	EXPOSURE	# No specific darktime header; use exposure time
-	CELL.DATE	STR	DATE-OBS
-	CELL.TIME	STR	TIME-OBS
+	FPA.POSANGLE	STR	ROTANGLE
+	FPA.RA		STR	RA
+	FPA.DEC		STR	DEC
+	FPA.RADECSYS	STR	RADECSYS
+	FPA.MJD		STR	MJD-OBS
+	CELL.EXPOSURE	STR	EXPTIME
+	CELL.DARKTIME	STR	DARKTIME
+	CELL.XBIN	STR	CCDBIN1
+	CELL.YBIN	STR	CCDBIN2
+	CELL.GAIN	STR	GAIN
+	CELL.READNOISE	STR	RDNOISE
+	CELL.SATURATION	STR	SATURATE
 END
 
 # Default PS concepts that may be specified by value
 DEFAULTS	METADATA
-	FPA.RADECSYS	STR	ICRS
+	CELL.BAD		S32	0
+	CELL.YPARITY_DEPEND	STR	CHIP.NAME
+	CELL.YPARITY	METADATA
+		ccd00	S32	-1
+		ccd01	S32	-1
+		ccd02	S32	-1
+		ccd03	S32	-1
+		ccd04	S32	-1
+		ccd05	S32	-1
+		ccd06	S32	-1
+		ccd07	S32	-1
+		ccd08	S32	-1
+		ccd09	S32	-1
+		ccd10	S32	-1
+		ccd11	S32	-1
+		ccd12	S32	-1
+		ccd13	S32	-1
+		ccd14	S32	-1
+		ccd15	S32	-1
+		ccd16	S32	-1
+		ccd17	S32	-1
+		ccd18	S32	1
+		ccd19	S32	1
+		ccd20	S32	1
+		ccd21	S32	1
+		ccd22	S32	1
+		ccd23	S32	1
+		ccd24	S32	1
+		ccd25	S32	1
+		ccd26	S32	1
+		ccd27	S32	1
+		ccd28	S32	1
+		ccd29	S32	1
+		ccd20	S32	1
+		ccd31	S32	1
+		ccd32	S32	1
+		ccd33	S32	1
+		ccd34	S32	1
+		ccd35	S32	1
+	END
 END
 
@@ -64,6 +170,6 @@
 DATABASE	METADATA
 	TYPE		dbEntry		TABLE		COLUMN		GIVENDBCOL	GIVENPS
-	CELL.GAIN	dbEntry		Camera		gain		chipId,cellId	CHIP.NAME,CELL.NAME
-	CELL.READNOISE	dbEntry		Camera		readNoise	chipId,cellId	CHIP.NAME,CELL.NAME
+#	CELL.GAIN	dbEntry		Camera		gain		chipId,cellId	CHIP.NAME,CELL.NAME
+#	CELL.READNOISE	dbEntry		Camera		readNoise	chipId,cellId	CHIP.NAME,CELL.NAME
 
 # A database entry refers to a particular column (COLUMN) in a
@@ -72,2 +178,3 @@
 
 END
+