Index: trunk/BNC/src/bncpppclient.cpp
===================================================================
--- trunk/BNC/src/bncpppclient.cpp	(revision 4415)
+++ trunk/BNC/src/bncpppclient.cpp	(revision 4416)
@@ -160,9 +160,9 @@
   // --------------------
   if      (obs.satSys == 'G') {
-    double C1 = obs.measdata("C1", 2.0);
-    double P1 = obs.measdata("P1", 2.0);
-    double P2 = obs.measdata("P2", 2.0);
-    double L1 = obs.measdata("L1", 2.0);
-    double L2 = obs.measdata("L2", 2.0);
+    double C1 = obs.measdata("C1C", 3.0);
+    double P1 = obs.measdata("C1P", 3.0);
+    double P2 = obs.measdata("C2P", 3.0);
+    double L1 = obs.measdata("L1P", 3.0); if (L1 == 0.0) L1 = obs.measdata("L1C", 3.0);
+    double L2 = obs.measdata("L2P", 3.0); if (L2 == 0.0) L2 = obs.measdata("L2C", 3.0);
     if ( (C1 || P1) && P2 && L1 && L2 ) {
       double f1 = t_CST::freq1;
@@ -194,10 +194,10 @@
   // ------------------------
   else if (obs.satSys == 'R') {
-    double C1 = obs.measdata("C1", 2.0);
-    double P1 = obs.measdata("P1", 2.0);
-    double C2 = obs.measdata("C2", 2.0);
-    double P2 = obs.measdata("P2", 2.0);
-    double L1 = obs.measdata("L1", 2.0);
-    double L2 = obs.measdata("L2", 2.0);
+    double C1 = obs.measdata("C1C", 3.0);
+    double P1 = obs.measdata("C1P", 3.0);
+    double C2 = obs.measdata("C2C", 3.0);
+    double P2 = obs.measdata("C2P", 3.0);
+    double L1 = obs.measdata("L1P", 3.0); if (L1 == 0.0) L1 = obs.measdata("L1C", 3.0);
+    double L2 = obs.measdata("L2P", 3.0); if (L2 == 0.0) L2 = obs.measdata("L2C", 3.0);
     if ( (P1 || C1) && (P2 || P2) && L1 && L2 ) {
       double f1 = t_CST::f1(obs.satSys, obs.slotNum);