Index: branches/BNC_2.11.0/src/bncrinex.cpp
===================================================================
--- branches/BNC_2.11.0/src/bncrinex.cpp	(revision 6778)
+++ branches/BNC_2.11.0/src/bncrinex.cpp	(revision 6779)
@@ -391,32 +391,25 @@
   // ---------------------------
   if (_header._obsTypesV3.size() == 0) {
-    _header._obsTypesV3['G'] << "C1C" << "L1C" << "D1C" << "S1C" 
-                             << "C1P" << "L1P" << "D1P" << "S1P" 
-                             << "C2C" << "L2C" << "D2C" << "S2C" 
-                             << "C2P" << "L2P" << "D2P" << "S2P" 
-                             << "C5"  << "D5"  << "L5"  << "S5";
     
-    _header._obsTypesV3['R'] << "C1C" << "L1C" << "D1C" << "S1C" 
-                             << "C1P" << "L1P" << "D1P" << "S1P" 
-                             << "C2C" << "L2C" << "D2C" << "S2C"
-                             << "C2P" << "L2P" << "D2P" << "S2P";
+    _header._obsTypesV3['G'] << "C1C" << "L1C"  << "S1C"
+                             << "C2W" << "L2W"  << "S2W"
+                             << "C5"  << "L5"   << "S5";
+
+    _header._obsTypesV3['R'] << "C1C" << "L1C" << "S1C"
+                             << "C2P" << "L2P" << "S2P";
     
-    _header._obsTypesV3['E'] << "C1" << "L1" << "D1" << "S1"
-                             << "C5" << "L5" << "D5" << "S5" 
-                             << "C6" << "L6" << "D6" << "S6"
-                             << "C7" << "L7" << "D7" << "S7"
-                             << "C8" << "L8" << "D8" << "S8";
+    _header._obsTypesV3['E'] << "C1" << "L1" << "S1"
+                             << "C5" << "L5" << "S5"
+                             << "C7" << "L7" << "S7"
+                             << "C8" << "L8" << "S8";
     
-    _header._obsTypesV3['J'] << "C1" << "L1" << "D1" << "S1" 
-                             << "C2" << "L2" << "D2" << "S2"
-                             << "C5" << "L5" << "D5" << "S5"
-                             << "C6" << "D6" << "L6" << "S6";
+    _header._obsTypesV3['J'] = _header._obsTypesV3['G'];
     
-    _header._obsTypesV3['S'] << "C1" << "L1" << "D1" << "S1" 
-                             << "C5" << "L5" << "D5" << "S5";
+    _header._obsTypesV3['S'] << "C1" << "L1" << "S1"
+                             << "C5" << "L5" << "S5";
     
-    _header._obsTypesV3['C'] << "C1" << "L1" << "D1" << "S1"
-                             << "C6" << "L6" << "D6" << "S6"
-                             << "C7" << "L7" << "D7" << "S7";
+    _header._obsTypesV3['C'] << "C1" << "L1" << "S1"
+                             << "C6" << "L6" << "S6"
+                             << "C7" << "L7" << "S7";
   }