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

Timestamp:

Nov 2, 2021, 5:00:00 PM (2 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -73 +73 @@
 
   const QMap<char, t_pppRefSat*>& refSatMap = epoch->refSatMap();
-
-  if (OPT->_obsModelType == OPT->DCMcodeBias ||
-      OPT->_obsModelType == OPT->DCMphaseBias) {
-    rememberState();
-  }
-
   //--
   // Set Parameters
@@ -85 +79 @@
   }
 
+  if (OPT->_obsModelType == OPT->DCMcodeBias ||
+      OPT->_obsModelType == OPT->DCMphaseBias) {
 #ifdef BNC_DEBUG_PPP
-  _parlist.printParams();
+  LOG << "processEpoch: printParams after set" << endl;
+  _parlist.printParams(_epoTime);
 #endif
-
+  }
   // Status Vector, Variance-Covariance Matrix
   // -----------------------------------------
@@ -94 +91 @@
   SymmetricMatrix QFltOld = _QFlt;
   setStateVectorAndVarCovMatrix(xFltOld, QFltOld);
-
 
   // Pre-Process Satellite Systems separately
@@ -122 +118 @@
         _xFlt = xFltOld;
         _QFlt = QFltOld;
+        restoreState(2);
         return failure;
       }
@@ -130 +127 @@
       _xFlt = xFltOld;
       _QFlt = QFltOld;
-      restoreState();
       return success;
     }
@@ -709 +705 @@
   // =============================================================
   if (resetRefSatellitesLastEpoch(allObs, refSatMap, refSatMapLastEpoch) != true) {
-    LOG  << "refsatChange required" << endl;
+    LOG  << "datumTransformation: refsatChange required" << endl;
     return success;
   }
@@ -724 +720 @@
 
 #ifdef BNC_DEBUG_PPP
-  _parlist.printParams();
+  LOG << "datumTransformation: printParams after set" << endl;
+  _parlist.printParams(_epoTime);
 #endif
 
@@ -812 +809 @@
   // ====================
 #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) {
@@ -828 +825 @@
 
 #ifdef BNC_DEBUG_PPP
-  LOG << "xFltOld:\n" << xFltOld << endl;
-  LOG << "xFlt   :\n" << _xFlt   << endl;
+  //LOG << "xFltOld:\n" << xFltOld << endl;
+  //LOG << "xFlt   :\n" << _xFlt   << endl;
 #endif
 
@@ -853 +850 @@
 
   _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
-
-  rememberState();
 
   return success;