Changeset 2228 in ntrip

Timestamp:

Jan 12, 2010, 9:54:35 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncpppclient.cpp (modified) (3 diffs)

trunk/BNC/bncpppclient.cpp

@@ -101 +101 @@
   QMutexLocker locker(&_mutex);
 
-  static const double c1 =   t_CST::freq1 * t_CST::freq1 / 
-                 (t_CST::freq1 * t_CST::freq1 - t_CST::freq2 * t_CST::freq2);
-  
-  static const double c2 = - t_CST::freq2 * t_CST::freq2 / 
-                 (t_CST::freq1 * t_CST::freq1 - t_CST::freq2 * t_CST::freq2);
-
   t_obsInternal* obs = &(pp->_o);
 
@@ -143 +137 @@
   }
 
+  double f1 = t_CST::freq1;
+  double f2 = t_CST::freq2;
+
+  // Ionosphere-Free Combination
+  // ---------------------------
+  double c1 =   f1 * f1 / (f1 * f1 - f2 * f2);
+  double c2 = - f2 * f2 / (f1 * f1 - f2 * f2);
+  
   satData->P3 =  c1 * satData->P1 + c2 * satData->P2;
 
@@ -148 +150 @@
   // ----------------------  
   if (obs->L1 && obs->L2) {
-    satData->L1 = obs->L1 * t_CST::lambda1;
-    satData->L2 = obs->L2 * t_CST::lambda2;
+    satData->L1 = obs->L1 * t_CST::c / f1;
+    satData->L2 = obs->L2 * t_CST::c / f2;
   }
   else {