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

Timestamp:

Mar 11, 2024, 3:28:32 PM (4 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 QMap<char, int> &usedSystems = _parlist->usedSystems();
-
   // Set Parameters
   // --------------
@@ -92 +90 @@
   // Process Satellite Systems separately
   // ------------------------------------
-  for (auto it = usedSystems.begin(); it != usedSystems.end(); ++it) {
-    char     sys = it.key();
-    unsigned num = 0;
+  for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
+    char sys = OPT->systems()[iSys];
+    int num = 0;
     vector<t_pppSatObs*> obsVector;
     for (unsigned jj = 0; jj < allObs.size(); jj++) {
@@ -167 +165 @@
     for (unsigned ii = 0; ii < obsVector.size(); ii++) {
       t_pppSatObs *obs = obsVector[ii];
-      char sys = obs->prn().system();
       if (iOutlier == 0) {
         obs->resetOutlier();
@@ -185 +182 @@
             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) {
-            offGlo = PPP_CLIENT->offGlo();
-          }
-          double offGal = 0.0;
-          if (sys == 'E' && tLC != t_lc::MW) {
-            offGal = PPP_CLIENT->offGal();
-          }
-          double offBds = 0.0;
-          if (sys == 'C' && tLC != t_lc::MW) {
-            offBds = PPP_CLIENT->offBds();
-          }
-          ll[iObs] = obs->obsValue(tLC) -offGps - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
+
+          ll[iObs] = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
           PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
         }
@@ -218 +200 @@
       for (unsigned ii = 0; ii < obsVector.size(); ii++) {
         t_pppSatObs *obs = obsVector[ii];
-        char sys = obs->prn().system();
         if (!obs->outlier()) {
           for (unsigned jj = 0; jj < usedLCs; jj++) {
@@ -233 +214 @@
               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) {
-              offGlo = PPP_CLIENT->offGlo();
-            }
-            double offGal = 0.0;
-            if (sys == 'E' && tLC != t_lc::MW) {
-              offGal = PPP_CLIENT->offGal();
-            }
-            double offBds = 0.0;
-            if (sys == 'C' && tLC != t_lc::MW) {
-              offBds = PPP_CLIENT->offBds();
-            }
-            ll[iObs] = obs->obsValue(tLC) -offGps - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
+            ll[iObs] = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs + 1));
             PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
           }
@@ -351 +316 @@
       for (unsigned iObs = 0; iObs < obsVector.size(); iObs++) {
         const t_pppSatObs *obs = obsVector[iObs];
-        char sys = obs->prn().system();
 
         // Check set Slips and Jump Counters
@@ -383 +347 @@
 
         // Check Pre-Fit Residuals
-        /* -----------------------
+        // -----------------------
         else {
           ColumnVector AA(params.size());
@@ -390 +354 @@
             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) {
-            offGlo = PPP_CLIENT->offGlo();
-          }
-          double offGal = 0.0;
-          if (sys == 'E' && tLC != t_lc::MW) {
-            offGal = PPP_CLIENT->offGal();
-          }
-          double offBds = 0.0;
-          if (sys == 'C' && tLC != t_lc::MW) {
-            offBds = PPP_CLIENT->offBds();
-          }
-          double ll = obs->obsValue(tLC) -offGps - offGlo - offGal - offBds  - obs->cmpValue(tLC) - DotProduct(_x0, AA);
+          double ll = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA);
           double vv = DotProduct(AA, _xFlt) - ll;
 
@@ -414 +362 @@
             resetAmb(obs->prn(), obsVector, tLC);
           }
-        }*/
+        }
       }
     }