Changeset 10015 in ntrip for trunk

Timestamp:

Mar 20, 2023, 2:10:04 PM (23 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (2 diffs)
• pppFilter.cpp (modified) (8 diffs)
• pppFilter.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -670 +670 @@
         }
       }
-
-      if (_opt->_refSatRequired) {
-        if (handleRefSatellites(_obsRover) != success) {
-          return finish(failure,6);
-        }
-        if (_obsPool->refSatChanged()) {
-          LOG << "t_pppFilter: refSatChanged()" << endl;
-          epochReProcessing = true;
-          continue;
-        }
-      }
-
       // use observations only if satellite code biases are available
       // ------------------------------------------------------------
@@ -688 +676 @@
            OPT->_obsModelType == OPT->DCMphaseBias)) {
         useObsWithCodeBiasesOnly(_obsRover);
+      }
+
+      if (_opt->_refSatRequired) {
+        if (handleRefSatellites(_obsRover) != success) {
+          return finish(failure,6);
+        }
+        if (_obsPool->refSatChanged()) {
+          LOG << "t_pppFilter: refSatChanged()" << endl;
+          epochReProcessing = true;
+          continue;
+        }
       }
 

trunk/BNC/src/PPP/pppFilter.cpp

@@ -64 +64 @@
   _epoTime = epoch->epoTime();
 
-  if (!_firstEpoTime.valid() || !_lastEpoTimeOK.valid()
-      || (maxSolGap > 0.0 && _epoTime - _lastEpoTimeOK > maxSolGap)) {
+  if (!_firstEpoTime.valid() ||
+      !_lastEpoTimeOK.valid()||
+      (maxSolGap > 0.0 && _epoTime - _lastEpoTimeOK > maxSolGap)) {
     _firstEpoTime = _epoTime;
   }
@@ -72 +73 @@
 
   const QMap<char, t_pppRefSat*> &refSatMap = epoch->refSatMap();
+
   const QList<char> &usedSystems = _parlist.usedSystems();
   //--
@@ -78 +80 @@
     return failure;
   }
+  #ifdef BNC_DEBUG_PPP
+  if (OPT->_obsModelType == OPT->DCMcodeBias ||
+      OPT->_obsModelType == OPT->DCMphaseBias) {
+    _parlist.printParams(_epoTime);
+  }
+#endif
 
   // Status Vector, Variance-Covariance Matrix
@@ -102 +110 @@
   bool preProcessing = false;
   if (OPT->_obsModelType == OPT->DCMcodeBias ||
-  OPT->_obsModelType == OPT->DCMphaseBias) {
+      OPT->_obsModelType == OPT->DCMphaseBias) {
     preProcessing = true;
     for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
@@ -162 +170 @@
     LOG << epoTimeStr << " SATNUM " << sys << ' ' << right << setw(2) << num
         << endl;
-    if (processSystem(OPT->LCs(sys), obsVector, _refPrn, epoch->pseudoObsIono(),
-        preProcessing) != success) {
+    if (processSystem(OPT->LCs(sys), obsVector, _refPrn,
+        epoch->pseudoObsIono(), preProcessing) != success) {
       LOG << "processSystem !=  success (fin-processing)" << endl;
       if (OPT->_obsModelType == OPT->DCMcodeBias ||
@@ -689 +697 @@
   _epoTime = epoch->epoTime();
   LOG.setf(ios::fixed);
-  LOG << string(_epoTime) << " DATUM TRANSFORMATION " << endl;
+  LOG << string(_epoTime) << "\nDATUM TRANSFORMATION " << endl;
 
   vector<t_pppSatObs*> &allObs = epoch->obsVector();
@@ -714 +722 @@
     return failure;
   }
+#ifdef BNC_DEBUG_PPP
+  _parlist.printParams(_epoTime);
+#endif
 
   const QList<char> &usedSystems = _parlist.usedSystems();
@@ -788 +799 @@
 
 #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
 

trunk/BNC/src/PPP/pppFilter.h

@@ -38 +38 @@
   void rememberState(int num) {
 #ifdef BNC_DEBUG_PPP
-    LOG << "Remember parameters from epoch before: _parlist_sav = _parlist ("<<  num << ")\n";
+    LOG << "Remember parameters from last epoch  : _parlist_sav = _parlist ("<<  num << ")\n";
 #endif
     _QFlt_sav    = _QFlt;
@@ -142 +142 @@
       }
 
-      if (AA.Ncols() > _numPar) {
-        LOG << "t_pppFilter::prepareAA: AA.Ncols() > _numPar: " << AA.Ncols() << " > " << _numPar << std::endl;
+      if (AA.Ncols() != _numPar) {
+        LOG << "t_pppFilter::prepareAA: AA.Ncols() != _numPar: " << AA.Ncols() << " != " << _numPar << "\n RETURN FAILURE" <<  std::endl;
         return failure;
       }
-      Prep->SubMatrix(_firstRow, _lastRow, 1, _numPar) << AA;
+      Prep->SubMatrix(_firstRow, _lastRow, 1, _numPar) = AA;
       return success;
     }