Changeset 4391 in ntrip for trunk/BNC/src/bncpppclient.cpp

Timestamp:

Jul 6, 2012, 4:09:16 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/bncpppclient.cpp (modified) (4 diffs)

trunk/BNC/src/bncpppclient.cpp

@@ -160 +160 @@
   // --------------------
   if      (obs.satSys == 'G') {
-    if ( (obs.p1() || obs.c1()) && (obs.p2() || obs.c2()) && obs.l1() && obs.l2() ) {
+    double C1C = obs.measdata("C1C");
+    double C1P = obs.measdata("C1P");
+    double C2C = obs.measdata("C2C");
+    double C2P = obs.measdata("C2P");
+    double L1  = obs.measdata("L1");
+    double L2  = obs.measdata("L2");
+    if ( (C1P || C1C) && (C2P || C2C) && L1 && L2 ) {
       double f1 = t_CST::freq1;
       double f2 = t_CST::freq2;
       double c1 =   f1 * f1 / (f1 * f1 - f2 * f2);
       double c2 = - f2 * f2 / (f1 * f1 - f2 * f2);
-      if (obs.p1()) {
-        satData->P1 = obs.p1() + (bb ? bb->p1 : 0.0);
+      if (C1P) {
+        satData->P1 = C1P + (bb ? bb->p1 : 0.0);
       }
       else {
-        satData->P1 = obs.c1() + (bb ? bb->c1 : 0.0);
-      }
-      if (obs.p2()) {
-        satData->P2 = obs.p2() + (bb ? bb->p2 : 0.0);
+        satData->P1 = C1C + (bb ? bb->c1 : 0.0);
+      }
+      if (C2P) {
+        satData->P2 = C2P + (bb ? bb->p2 : 0.0);
       }
       else {
-        satData->P2 = obs.c2();
-      }
-      satData->L1      = obs.l1() * t_CST::c / f1;
-      satData->L2      = obs.l2() * t_CST::c / f2;
+        satData->P2 = C2C;
+      }
+      satData->L1      = L1 * t_CST::c / f1;
+      satData->L2      = L2 * t_CST::c / f2;
       satData->P3      = c1 * satData->P1 + c2 * satData->P2;
       satData->L3      = c1 * satData->L1 + c2 * satData->L2;
@@ -193 +199 @@
   // ------------------------
   else if (obs.satSys == 'R') {
-    if ( (obs.p1() || obs.c1()) && (obs.p2() || obs.c2()) && obs.l1() && obs.l2() ) {
+    double C1C = obs.measdata("C1C");
+    double C1P = obs.measdata("C1P");
+    double C2C = obs.measdata("C2C");
+    double C2P = obs.measdata("C2P");
+    double L1  = obs.measdata("L1");
+    double L2  = obs.measdata("L2");
+    if ( (C1P || C1C) && (C2P || C2C) && L1 && L2 ) {
       double f1 = t_CST::f1(obs.satSys, obs.slotNum); 
       double f2 = t_CST::f2(obs.satSys, obs.slotNum); 
       double c1 =   f1 * f1 / (f1 * f1 - f2 * f2);
       double c2 = - f2 * f2 / (f1 * f1 - f2 * f2);
-      if (obs.p1()) {
-        satData->P1 = obs.p1() + (bb ? bb->p1 : 0.0);
+      if (C1P) {
+        satData->P1 = C1P + (bb ? bb->p1 : 0.0);
       }
       else {
-        satData->P1 = obs.c1() + (bb ? bb->c1 : 0.0);
-      }
-      if (obs.p2()) {
-        satData->P2 = obs.p2() + (bb ? bb->p2 : 0.0);
+        satData->P1 = C1C + (bb ? bb->c1 : 0.0);
+      }
+      if (C2P) {
+        satData->P2 = C2P + (bb ? bb->p2 : 0.0);
       }
       else {
-        satData->P2 = obs.c2();
-      }
-      satData->L1      = obs.l1() * t_CST::c / f1;
-      satData->L2      = obs.l2() * t_CST::c / f2;
+        satData->P2 = C2C;
+      }
+      satData->L1      = L1 * t_CST::c / f1;
+      satData->L2      = L2 * t_CST::c / f2;
       satData->P3      = c1 * satData->P1 + c2 * satData->P2;
       satData->L3      = c1 * satData->L1 + c2 * satData->L2;
@@ -226 +238 @@
   // ------------------------
   else if (obs.satSys == 'E') {
-    if ( obs.c1() && obs.c5() && obs.l1() && obs.l5()) {
+    double C1 = obs.measdata("C1");
+    double L1 = obs.measdata("L1");
+    double C5 = obs.measdata("C5");
+    double L5 = obs.measdata("L5");
+    if ( C1 && C5 && L1 && L5) {
       double f1 = t_CST::freq1;
       double f5 = t_CST::freq5;
@@ -232 +248 @@
       double c5 = - f5 * f5 / (f1 * f1 - f5 * f5);
 
-      satData->P1      = obs.c1();
-      satData->P5      = obs.c5();
-      satData->L1      = obs.l1() * t_CST::c / f1;
-      satData->L5      = obs.l5() * t_CST::c / f5;
+      satData->P1      = C1;
+      satData->P5      = C5;
+      satData->L1      = L1 * t_CST::c / f1;
+      satData->L5      = L5 * t_CST::c / f5;
       satData->P3      = c1 * satData->P1 + c5 * satData->P5;
       satData->L3      = c1 * satData->L1 + c5 * satData->L5;