Index: /trunk/ippconfig/cfh12k/camera.config
===================================================================
--- /trunk/ippconfig/cfh12k/camera.config	(revision 15549)
+++ /trunk/ippconfig/cfh12k/camera.config	(revision 15550)
@@ -3,6 +3,6 @@
 # File formats that we know about
 FORMATS		METADATA
-	EARLY	STR	cfh12k/format_mef_early.config
-	ESPLIT	STR	cfh12k/format_split_early.config
+#	EARLY	STR	cfh12k/format_mef_early.config
+#	ESPLIT	STR	cfh12k/format_split_early.config
 	MEF	STR	cfh12k/format_mef.config
 	SPLIT	STR	cfh12k/format_split.config
Index: /trunk/ippconfig/cfh12k/format_mef.config
===================================================================
--- /trunk/ippconfig/cfh12k/format_mef.config	(revision 15549)
+++ /trunk/ippconfig/cfh12k/format_mef.config	(revision 15550)
@@ -15,7 +15,6 @@
 	EXTENSIONS	STR	CHIP	# The extensions represent chips
 	FPA.NAME	STR	EXPNUM	# A PHU keyword for unique identifier
-	CHIP.NAME	STR	EXTNAME	# An extension keyword for unique identifie
-	EXTWORD         STR     EXTNAME
-	# change this to CONTENT?
+	CHIP.NAME	STR	IMAGEID	# An extension keyword for unique identifie
+	EXTWORD         STR     IMAGEID
 END
 
@@ -23,16 +22,16 @@
 CONTENTS	METADATA
 	# Extension name, chip name:component cell
-	chip00		STR	ccd00:MIT-LL
-	chip01		STR	ccd01:MIT-LL
-	chip02		STR	ccd02:MIT-LL
-	chip03		STR	ccd03:MIT-LL
-	chip04		STR	ccd04:MIT-LL
-	chip05		STR	ccd05:MIT-LL
-	chip06		STR	ccd06:MIT-LL
-	chip07		STR	ccd07:MIT-LL
-	chip08		STR	ccd08:MIT-LL
-	chip09		STR	ccd09:MIT-LL
-	chip10		STR	ccd10:MIT-LL
-	chip11		STR	ccd11:MIT-LL
+	 0		STR	ccd00:MIT-LL
+	 1		STR	ccd01:MIT-LL
+	 2		STR	ccd02:MIT-LL
+	 3		STR	ccd03:MIT-LL
+	 4		STR	ccd04:MIT-LL
+	 5		STR	ccd05:MIT-LL
+	 6		STR	ccd06:MIT-LL
+	 7		STR	ccd07:MIT-LL
+	 8		STR	ccd08:MIT-LL
+	 9		STR	ccd09:MIT-LL
+	10		STR	ccd10:MIT-LL
+	11		STR	ccd11:MIT-LL
 END
 
@@ -56,7 +55,7 @@
 # How to translate PS concepts into FITS headers
 TRANSLATION	METADATA
-        FPA.AIRMASS     STR     AIRMASS
 	FPA.OBSTYPE	STR	OBSTYPE
 	FPA.OBJECT	STR	OBJECT
+        FPA.AIRMASS     STR     AIRMASS
         FPA.FILTERID    STR     FILTER
         FPA.FILTER      STR     FILTER
Index: /trunk/ippconfig/cfh12k/format_mef_early.config
===================================================================
--- /trunk/ippconfig/cfh12k/format_mef_early.config	(revision 15549)
+++ /trunk/ippconfig/cfh12k/format_mef_early.config	(revision 15550)
@@ -8,8 +8,8 @@
 	INSTRUME	STR	CFH12K Mosaic
 	EXTEND		BOOL	T
-        IMAGESWV        MULTI
-	IMAGESWV	STR     CFHT DetCom v3.25 (Jun 13 2001)    
-	IMAGESWV	STR     CFHT DetCom v3.28 (Jul 11 2001)    
-	IMAGESWV	STR     CFHT DetCom v3.35 (May 01 2002)
+#       IMAGESWV        MULTI
+#	IMAGESWV	STR     CFHT DetCom v3.25 (Jun 13 2001)    
+#	IMAGESWV	STR     CFHT DetCom v3.28 (Jul 11 2001)    
+#	IMAGESWV	STR     CFHT DetCom v3.35 (May 01 2002)
 END
 
@@ -169,2 +169,16 @@
 END
  
+#  fits  CFHT 12kcom v2 2 (Sep 28 1999)  
+#  fits  CFHT 12kcom v2 6 (Dec 01 1999)  
+#  fits  CFHT DetCom v3 1 (Oct 19 2000)  
+#  fits  CFHT DetCom v3 2 (Dec 23 2000)  
+#  fits  CFHT DetCom v3 22 (Apr 12 2001)  
+#  fits  CFHT DetCom v3 25 (Jun 13 2001)  
+#  fits  CFHT DetCom v3 32 (Oct 20 2001)  
+#  fits  CFHT DetCom v3 33 (Dec 09 2001)  
+#  fits  CFHT DetCom v3 35 (Jan 07 2002)  
+#  fits  CFHT DetCom v3 35 (Mar 09 2002)  
+#  fits  CFHT DetCom v3 35 (May 01 2002)  
+#  fits  CFHT DetCom v3 7 (Jun 29 2000)  
+#  fits  CFHT DetCom v3 8 (Aug 02 2000)  
+#  fits  CFHT DetCom v3 9 (Sep 15 2000)  
Index: /trunk/ippconfig/cfh12k/format_split.config
===================================================================
--- /trunk/ippconfig/cfh12k/format_split.config	(revision 15549)
+++ /trunk/ippconfig/cfh12k/format_split.config	(revision 15550)
@@ -12,10 +12,11 @@
 FILE	METADATA
 	# How to read this data
-	PHU		STR	CHIP	# The FITS file represents an entire FPA
-	EXTENSIONS	STR	NONE	# The extensions represent chips
-	FPA.NAME	STR	EXPNUM	# A PHU keyword for unique identifier
-	CONTENT		STR	IMAGEID	# Key to the CONTENTS menu
+	PHU		STR	CHIP	 # The FITS file represents an entire FPA
+	EXTENSIONS	STR	NONE	 # The extensions represent chips
+	FPA.NAME	STR	EXPNUM	 # A PHU keyword for unique identifier
+	CHIP.NAME	STR	IMAGEID	 # An extension keyword for unique identifie
+	EXTWORD         STR     IMAGEID
+	CONTENT		STR	IMAGEID	 # Key to the CONTENTS menu
 	CONTENT.RULE	STR	{CHIP.N} # How to derive the CONTENT when writing
-	EXTWORD         STR     EXTNAME
 END
 
@@ -58,5 +59,8 @@
 # How to translate PS concepts into FITS headers
 TRANSLATION	METADATA
+	FPA.OBSTYPE	STR	OBSTYPE
+	FPA.OBJECT	STR	OBSTYPE
         FPA.AIRMASS     STR     AIRMASS
+        FPA.FILTERID    STR     FILTER
         FPA.FILTER      STR     FILTER
         FPA.POSANGLE    STR     ROTANGLE
@@ -64,6 +68,4 @@
         FPA.DEC         STR     DEC
         FPA.RADECSYS    STR     RADECSYS
-	FPA.OBSTYPE	STR	OBSTYPE
-	FPA.OBJECT	STR	OBSTYPE
 	FPA.FOCUS	STR	TELFOCUS
 	FPA.TIME	STR	MJD-OBS
@@ -92,4 +94,5 @@
 	CELL.XSIZE		S32	2048
 	CELL.YSIZE		S32	4096
+	CELL.READNOISE          F32     10.0
 	CELL.READDIR		S32	1		# Cell is read in x direction
         CELL.BAD                S32     0
Index: /trunk/ippconfig/cfh12k/format_split_early.config
===================================================================
--- /trunk/ippconfig/cfh12k/format_split_early.config	(revision 15549)
+++ /trunk/ippconfig/cfh12k/format_split_early.config	(revision 15550)
@@ -63,7 +63,7 @@
 # How to translate PS concepts into FITS headers
 TRANSLATION	METADATA
-        FPA.AIRMASS     STR     AIRMASS
 	FPA.OBSTYPE	STR	OBSTYPE
 	FPA.OBJECT	STR	OBSTYPE
+        FPA.AIRMASS     STR     AIRMASS
         FPA.FILTERID    STR     FILTER
         FPA.FILTER      STR     FILTER