Index: /branches/czw_branch/20130702/ippconfig/suprime/camera.config
===================================================================
--- /branches/czw_branch/20130702/ippconfig/suprime/camera.config	(revision 36049)
+++ /branches/czw_branch/20130702/ippconfig/suprime/camera.config	(revision 36050)
@@ -3,7 +3,7 @@
 # File formats that we know about
 FORMATS         METADATA
+	MEF	STR	suprime/format_mef.config
         RAW     STR     suprime/format_raw.config
         SPLIT   STR     suprime/format_split.config
-	MEF	STR	suprime/format_mef.config
 END
 
@@ -19,5 +19,5 @@
 	XY31	 STR	Cell
 	XY40	 STR	Cell
-	XY30_raw STR	ch1 ch2 ch3 ch4
+	XY30	 STR	Cell
 	XY01_raw STR	ch1 ch2 ch3 ch4
 	XY11_raw STR	ch1 ch2 ch3 ch4
@@ -35,40 +35,16 @@
 FILTER.ID       METADATA
   Rc        STR   W-C-RC
+  Vr	    STR	  W-J-VR
 
-   u        STR   u.MP9301     
-   g        STR   g.MP9401     
-   r        STR   r.MP9601     
-   i        MULTI
-   i        STR   i.MP9701     
-   i        STR   i.MP9702     
-   z        MULTI
-   z        STR   z.MP9801     
-   z        STR   Zp           
-   z        STR   Zprime       
-
-   Ha       MULTI
-   Ha       STR   Ha.MP7605    
-   Ha       STR   Halpha       
-   Ha       STR   Haalpha.on   
-   HaOff    STR   HaOFF.MP7604 
-   	              		
-   CN       MULTI
-   CN       STR   CN.MP780     
-   CN       STR   cn.MP7803    
-   CN       STR   CN.MP7803    
-   	              		
-   TiO      MULTI
-   TiO      STR   TiO.MP77     
-   TiO      STR   tio.MP7701   
-   TiO      STR   TiO.MP7701   
-   NB920    STR   NB920        
-   	              		
-   B2F      STR   B2F          
-   Bj       STR   Bj           
-   Vj       STR   Vj           
-   Rj       STR   Rj           
-   Ij       STR   Ij           
-   Hb       STR   Hb           
-   HbOff    STR   HbOff        
+  B	    STR	  W-J-B
+  V	    STR	  W-J-V
+  R	    STR	  W-C-RC
+  I	    STR	  W-C-IC
+  g	    STR	  W-S-G+
+  r	    STR	  W-S-R+
+  i	    STR	  W-S-I+
+  z	    STR	  W-S-Z+
+  
+  Y	    STR	  W-J-Y
 END
 
