Changeset 9537 in ntrip for trunk

Timestamp:

Nov 9, 2021, 1:12:39 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (1 diff)
• PPP/pppFilter.cpp (modified) (5 diffs)
• PPP/pppSatObs.cpp (modified) (2 diffs)
• pppWidgets.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -688 +688 @@
       else {
         epochReProcessing = false;
-        _filter->rememberState(0);
-      }
-
+        if (OPT->_obsModelType == OPT->DCMcodeBias ||
+            OPT->_obsModelType == OPT->DCMphaseBias) {
+          _filter->rememberState(0);
+        }
+      }
     } while (epochReProcessing);
 

trunk/BNC/src/PPP/pppFilter.cpp

@@ -119 +119 @@
       if (processSystem(OPT->LCs(sys), obsVector, _refPrn,
                         epoch->pseudoObsIono(), preProcessing) != success) {
+        LOG << "processSystem !=  success (pre-processing)" << endl;
         _xFlt = xFltOld;
         _QFlt = QFltOld;
@@ -162 +163 @@
     if (processSystem(OPT->LCs(sys), obsVector, _refPrn,
                       epoch->pseudoObsIono(), preProcessing) != success) {
+      LOG << "processSystem !=  success (fin-processing)" << endl;
+      _xFlt = xFltOld;
+      _QFlt = QFltOld;
+      if (OPT->_obsModelType == OPT->DCMcodeBias ||
+          OPT->_obsModelType == OPT->DCMphaseBias) {
+        _obsPool->deleteLastEpoch();
+        restoreState(3);
+      }
       return failure;
     }
@@ -318 +327 @@
     // Check number of observations, truncate matrices
     // -----------------------------------------------
-    if (iObs == -1) {
+    if (iObs == -1) {LOG << "iObs == -1\n";
       return failure;
     }
@@ -716 +725 @@
     return success;
   }
-//  LOG << "datumTransformation: printParams before set" << endl;
-//  _parlist.printParams(_epoTime);
+  //LOG << "datumTransformation: printParams before set" << endl;
+  //_parlist.printParams(_epoTime);
 
   // set AA2
@@ -814 +823 @@
   // ====================
 #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) {

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -315 +315 @@
   retVal = sqrt(retVal);
 
+  // De-Weight GLONASS
+  // -----------------
+  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
+    retVal *= 5.0;
+  }
+
+  // De-Weight BDS
+  // -------------
+  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
+    retVal *= 2.0;
+  }
+
   // Elevation-Dependent Weighting
   // -----------------------------
@@ -353 +365 @@
 
   retVal = sqrt(retVal);
+
+  // De-Weight GLONASS
+  // -----------------
+  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
+    retVal *= 2.0;
+  }
+
+  // De-Weight BDS
+  // -------------
+  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
+    retVal *= 2.0;
+  }
+
 
   return retVal;

trunk/BNC/src/pppWidgets.cpp

@@ -155 +155 @@
 #else
   _modelObs->addItems(QString("Ionosphere-free PPP,Uncombined PPP,PPP-RTK,DCM with Code Biases,DCM with Phase Biases").split(","));
-  _pseudoObs->addItems(QString("no,Ionosphere&Troposphere").split(","));
+  _pseudoObs->addItems(QString("no,Troposphere,Ionosphere,Ionosphere&Troposphere").split(","));
 #endif