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

Timestamp:

Nov 18, 2021, 4:55:06 PM (2 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -249 +249 @@
           const t_lc::type tLC = LCs[jj];
           if (tLC == t_lc::GIM) {continue;}
-          if (tLC == t_lc::Tz0) {continue;}
           ++iObs;
           usedObs.push_back(obs);
@@ -683 +682 @@
   const QMap<char, t_pppRefSat*>& refSatMapLastEpoch = epoch->refSatMap();
 
-  bool peseudoObsIono = epoch->pseudoObsIono();
+  bool pseudoObsIono = epoch->pseudoObsIono();
 
   // reset old and set new refSats in last epoch (ambiguities/GIM)
   // =============================================================
   if (resetRefSatellitesLastEpoch(allObs, refSatMap, refSatMapLastEpoch) != true) {
-    LOG  << "datumTransformation: refsatChange required" << endl;
-    return success;
+    LOG  << "datumTransformation: resetRefSatellitesLastEpoch != success" << endl;
+    return failure;
   }
 
   if (OPT->_obsModelType == OPT->UncombPPP) {
-    _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
+    _obsPool->putEpoch(_epoTime, allObs, pseudoObsIono, refSatMap);
     return success;
   }
@@ -724 +723 @@
     vector<t_lc::type> LCs = OPT->LCs(sys);
     unsigned usedLCs = LCs.size();
-    if (OPT->_pseudoObsIono && !peseudoObsIono) {
+    if (OPT->_pseudoObsIono && !pseudoObsIono) {
         usedLCs -= 1;  // GIM not used
     }
@@ -730 +729 @@
     unsigned maxObs = obsVector.size() * usedLCs;
 
-    if (OPT->_pseudoObsIono && peseudoObsIono) {
+    if (OPT->_pseudoObsIono && pseudoObsIono) {
       maxObs -= 1; // pseudo obs iono with respect to refSat
     }
@@ -747 +746 @@
         const t_lc::type tLC = LCs[jj];
         if (tLC == t_lc::GIM) {continue;}
-        if (tLC == t_lc::Tz0) {continue;}
         ++iObs;
         for (unsigned iPar = 0; iPar < nPar; iPar++) {
@@ -769 +767 @@
   // ====================
 #ifdef BNC_DEBUG_PPP
-      //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
-      //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
+  //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
+  //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
 #endif
   if(_datumTrafo->computeTrafoMatrix() != success) {
@@ -776 +774 @@
   }
 #ifdef BNC_DEBUG_PPP
-      //LOG << "D21" << endl; _datumTrafo->printMatrix(_datumTrafo->D21(), _datumTrafo->numObs(), _datumTrafo->numPar());
+  //LOG << "D21" << endl; _datumTrafo->printMatrix(_datumTrafo->D21(), _datumTrafo->numObs(), _datumTrafo->numPar());
 #endif
   ColumnVector    xFltOld = _xFlt;
@@ -809 +807 @@
   _datumTrafo->switchAA();
 
-  _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
+  _obsPool->putEpoch(_epoTime, allObs, pseudoObsIono, refSatMap);
 
   return success;