Changeset 6634 in ntrip

Timestamp:

Mar 5, 2015, 2:59:33 PM (9 years ago)

Author:

stuerze

Message:

consider iono-free LK of receiver antenna PCO in standard PPP mode

Location:

trunk/BNC/src/PPP_free

Files:

• pppClient.cpp (modified) (2 diffs)
• pppFilter.cpp (modified) (2 diffs)
• pppFilter.h (modified) (2 diffs)

trunk/BNC/src/PPP_free/pppClient.cpp

@@ -187 +187 @@
       satData->L3      = a1 * satData->L1 + a2 * satData->L2;
       satData->lambda3 = a1 * t_CST::c / f1 + a2 * t_CST::c / f2;
+      satData->lkA     = a1;
+      satData->lkB     = a2;
       _epoData->satData[satData->prn] = satData;
     }
@@ -208 +210 @@
       satData->L3      = a1 * satData->L1 + a5 * satData->L5;
       satData->lambda3 = a1 * t_CST::c / f1 + a5 * t_CST::c / f5;
+      satData->lkA     = a1;
+      satData->lkB     = a5;
       _epoData->satData[satData->prn] = satData;
     }

trunk/BNC/src/PPP_free/pppFilter.cpp

@@ -328 +328 @@
 
   double offset = 0.0;
+  t_frequency::type frqA = t_frequency::G1;
+  t_frequency::type frqB = t_frequency::G2;
   if      (satData->prn[0] == 'R') {
     offset = Glonass_offset();
+    frqA = t_frequency::R1;
+    frqB = t_frequency::R2;
   }
   else if (satData->prn[0] == 'E') {
     offset = Galileo_offset();
+    //frqA = t_frequency::E1; as soon as available
+    //frqB = t_frequency::E5; -"-
   }
 
@@ -338 +344 @@
   if (_antex) { 
     bool found;
-    phaseCenter = _antex->rcvCorr(OPT->_antNameRover, t_frequency::G1, 
-                                  satData->eleSat, satData->azSat, found);
+    phaseCenter = satData->lkA * _antex->rcvCorr(OPT->_antNameRover, frqA,
+                                                 satData->eleSat, satData->azSat,
+                                                 found)
+                + satData->lkB * _antex->rcvCorr(OPT->_antNameRover, frqB,
+                                                 satData->eleSat, satData->azSat,
+                                                 found);
     if (!found) {
       LOG << "ANTEX: antenna >" << OPT->_antNameRover << "< not found\n";

trunk/BNC/src/PPP_free/pppFilter.h

@@ -47 +47 @@
   t_satData() {
     obsIndex = 0;
-    P1 = 0.0;
-    P2 = 0.0;
-    P5 = 0.0;
-    P3 = 0.0;
-    L1 = 0.0;
-    L2 = 0.0;
-    L5 = 0.0;
-    L3 = 0.0;
+    P1      = 0.0;
+    P2      = 0.0;
+    P5      = 0.0;
+    P3      = 0.0;
+    L1      = 0.0;
+    L2      = 0.0;
+    L5      = 0.0;
+    L3      = 0.0;
+    lkA     = 0.0;
+    lkB     = 0.0;
   }
   ~t_satData() {}
@@ -75 +77 @@
   bool         slipFlag;
   double       lambda3;
+  double       lkA;
+  double       lkB;
   unsigned     obsIndex;
   char system() const {return prn.toAscii()[0];}