Changeset 10373 in ntrip for trunk/BNC/src/PPP/pppFilter.cpp

Timestamp:

Mar 1, 2024, 4:12:31 PM (9 months ago)

Author:

stuerze

Message:

changes regarding PPP

File:

• trunk/BNC/src/PPP/pppFilter.cpp (modified) (10 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -76 +76 @@
   string epoTimeStr = string(_epoTime);
 
-  const QList<char> &usedSystems = _parlist->usedSystems();
+  const QMap<char, int> &usedSystems = _parlist->usedSystems();
 
   // Set Parameters
@@ -92 +92 @@
   // Process Satellite Systems separately
   // ------------------------------------
-  for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
-    char sys = usedSystems[iSys];
-    unsigned int num = 0;
+  for (auto it = usedSystems.begin(); it != usedSystems.end(); ++it) {
+    char     sys = it.key();
+    unsigned num = 0;
     vector<t_pppSatObs*> obsVector;
     for (unsigned jj = 0; jj < allObs.size(); jj++) {
@@ -185 +185 @@
             AA[iObs][iPar] = par->partial(_epoTime, obs, tLC);
           }
+          double offGps = 0.0;
+          if (sys == 'G' && tLC != t_lc::MW) {
+            offGps = PPP_CLIENT->offGps();
+          }
           double offGlo = 0.0;
           if (sys == 'R' && tLC != t_lc::MW) {
@@ -197 +201 @@
             offBds = PPP_CLIENT->offBds();
           }
-          ll[iObs] = obs->obsValue(tLC) - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
+          ll[iObs] = obs->obsValue(tLC) -offGps - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
           PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
         }
@@ -229 +233 @@
               AA[iObs][iPar] = par->partial(_epoTime, obs, tLC);
             }
+            double offGps = 0.0;
+            if (sys == 'G' && tLC != t_lc::MW) {
+              offGps = PPP_CLIENT->offGps();
+            }
             double offGlo = 0.0;
             if (sys == 'R' && tLC != t_lc::MW) {
@@ -241 +249 @@
               offBds = PPP_CLIENT->offBds();
             }
-            ll[iObs] = obs->obsValue(tLC) - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
+            ll[iObs] = obs->obsValue(tLC) -offGps - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
             PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
           }
@@ -375 +383 @@
 
         // Check Pre-Fit Residuals
-        /* -----------------------
+        // -----------------------
         else {
           ColumnVector AA(params.size());
@@ -382 +390 @@
             AA[iPar] = par->partial(_epoTime, obs, tLC);
           }
+          double offGps = 0.0;
+          if (sys == 'G' && tLC != t_lc::MW) {
+            offGps = PPP_CLIENT->offGps();
+          }
           double offGlo = 0.0;
           if (sys == 'R' && tLC != t_lc::MW) {
@@ -394 +406 @@
             offBds = PPP_CLIENT->offBds();
           }
-          double ll = obs->obsValue(tLC) - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA);
+          double ll = obs->obsValue(tLC) -offGps - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA);
           double vv = DotProduct(AA, _xFlt) - ll;
 
@@ -402 +414 @@
             resetAmb(obs->prn(), obsVector, tLC);
           }
-        }*/
+        }
       }
     }