Changeset 9538 in ntrip for trunk/BNC/src/PPP

Timestamp:

Nov 9, 2021, 3:37:15 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP: pseudo obs tropo completely removed

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (1 diff)
• pppFilter.cpp (modified) (5 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -232 +232 @@
     }
   }
-  if (_opt->_pseudoObsTropo) {
-    vector<t_pppSatObs*>::iterator it = obsVector.begin();
-    while (it != obsVector.end()) {
-      t_pppSatObs* satObs = *it;
-      if (satObs->isReference()) {
-        satObs->setPseudoObsTropo();
-      }
-      it++;
-    }
-  }
+
 /*
   vector<t_pppSatObs*>::iterator it = obsVector.begin();

trunk/BNC/src/PPP/pppFilter.cpp

@@ -212 +212 @@
       usedLCs -= 1;  // GIM not used
   }
-  int hlpLCs = 0;
-  if (OPT->_pseudoObsTropo) {
-    hlpLCs = -1;
-  }
   // max Obs
-  unsigned maxObs = obsVector.size() * (usedLCs + hlpLCs);
-  if (OPT->_pseudoObsTropo && _datumTrafo->firstSystem(sys)) {
-    maxObs += 1;
-  }
+  unsigned maxObs = obsVector.size() * usedLCs;
+
   if (OPT->_pseudoObsIono && pseudoObsIonoAvailable) {
     maxObs -= 1; // pseudo obs iono with respect to refSat
@@ -257 +251 @@
           if (tLC == t_lc::Tz0) {continue;}
           ++iObs;
-          usedObs.push_back(obs);
-          usedTypes.push_back(tLC);
-          for (unsigned iPar = 0; iPar < nPar; iPar++) {
-            const t_pppParam* par = params[iPar];
-            AA[iObs][iPar] = par->partial(_epoTime, obs, tLC, refPrn);
-          }
-          ll[iObs] = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA.Row(iObs+1));
-          PP[iObs] = 1.0 / (obs->sigma(tLC) * obs->sigma(tLC));
-        }
-      }
-    }
-
-    // pseudo Obs Tropo
-    // ================
-    if (OPT->_pseudoObsTropo && _datumTrafo->firstSystem(sys)) {
-      bool _pseudoObsTropoConsidered = false;
-      for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-        if (_pseudoObsTropoConsidered) {break;}
-        t_pppSatObs* obs = obsVector[ii];
-        for (unsigned jj = 0; jj < usedLCs; jj++) {
-          const t_lc::type tLC = LCs[jj];
-          if (tLC != t_lc::Tz0) {continue;}
-          ++iObs;
-          _pseudoObsTropoConsidered = true;
           usedObs.push_back(obs);
           usedTypes.push_back(tLC);
@@ -756 +726 @@
         usedLCs -= 1;  // GIM not used
     }
-    int hlpLCs = 0;
-    if (OPT->_pseudoObsTropo) {
-      hlpLCs = -1;
-    }
     // max Obs
-    unsigned maxObs = obsVector.size() * (usedLCs + hlpLCs);
-
-    if (OPT->_pseudoObsTropo && _datumTrafo->firstSystem(sys)) {
-      maxObs += 1;
-    }
+    unsigned maxObs = obsVector.size() * usedLCs;
+
     if (OPT->_pseudoObsIono && peseudoObsIono) {
       maxObs -= 1; // pseudo obs iono with respect to refSat
@@ -791 +754 @@
       }
     }
-    // pseudo Obs Tropo
-    // ================
-    if (OPT->_pseudoObsTropo && _datumTrafo->firstSystem(sys)) {
-      bool pseudoObsTropoConsidered = false;
-      for (unsigned ii = 0; ii < obsVector.size(); ii++) {
-        if (pseudoObsTropoConsidered) {break;}
-        t_pppSatObs* obs = obsVector[ii];
-        for (unsigned jj = 0; jj < usedLCs; jj++) {
-          const t_lc::type tLC = LCs[jj];
-          if (tLC != t_lc::Tz0) {continue;}
-          ++iObs;
-          pseudoObsTropoConsidered = true;
-          for (unsigned iPar = 0; iPar < nPar; iPar++) {
-            const t_pppParam* par = params[iPar];
-            AA[iObs][iPar] = par->partial(_epoTime, obs, tLC, refPrn);
-          }
-        }
-      }
-    }
+
     if (!iObs) {
       continue;
@@ -888 +833 @@
       realUsedLCs -= 1;
     }
-    if (OPT->_pseudoObsTropo) {
-      realUsedLCs -= 1;
-    }
+
     trafoObs += satNum * realUsedLCs;
 
-    if (OPT->_pseudoObsTropo && _datumTrafo->firstSystem(sys)) {
-      trafoObs += 1;
-    }
     if (OPT->_pseudoObsIono && pseudoObsIono) {
       trafoObs -= 1; // pseudo obs iono with respect to refSat