Changeset 10373 in ntrip for trunk/BNC/src/PPP/pppParlist.cpp

Timestamp:

Mar 1, 2024, 4:12:31 PM (8 months ago)

Author:

stuerze

Message:

changes regarding PPP

File:

• trunk/BNC/src/PPP/pppParlist.cpp (modified) (11 diffs)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -74 +74 @@
          const t_pppSatObs* obs = obsVector->at(ii);
          if (obs->prn() == _prn) {
+           double offGps = 0.0;
+           if (_prn.system() == 'G' && tLC != t_lc::MW) {
+             offGps = PPP_CLIENT->offGps();
+           }
            double offGlo = 0.0;
            if (_prn.system() == 'R' && tLC != t_lc::MW) {
@@ -86 +90 @@
              offBds = PPP_CLIENT->offBds();
            }
-           _x0 = floor((obs->obsValue(tLC) - offGlo - offGal - offBds - obs->cmpValue(tLC)) / obs->lambda(tLC) + 0.5);
+           _x0 = floor((obs->obsValue(tLC) - offGps - offGlo - offGal - offBds - obs->cmpValue(tLC)) / obs->lambda(tLC) + 0.5);
            break;
          }
        }
      }
+     break;
+   case offGps:
+     _epoSpec = true;
+     _sigma0  = OPT->_aprSigClkOff;
+     _x0      = PPP_CLIENT->offGps();
      break;
    case offGlo:
@@ -171 +180 @@
     if (tLC == t_lc::GIM) {return 0.0;}
     return 1.0;
+  case offGps:
+    if (tLC == t_lc::GIM) {return 0.0;}
+    return (obs->prn().system() == 'G') ? 1.0 : 0.0;
   case offGlo:
     if (tLC == t_lc::GIM) {return 0.0;}
@@ -299 +311 @@
     ss << "REC_CLK     ";
     break;
+  case offGps:
+    ss << "OFF_GPS     ";
+    break;
   case offGlo:
     ss << "OFF_GLO     ";
@@ -345 +360 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppParlist::~t_pppParlist() {
-  _usedSystems.clear();
 
   for (unsigned ii = 0; ii < _params.size(); ii++) {
@@ -396 +410 @@
   // check which systems have observations
   // -------------------------------------
-  _usedSystems.clear();
+  _usedSystems['G'] = _usedSystems['R'] = _usedSystems['E'] = _usedSystems['C'] = 0;
   for (unsigned jj = 0; jj < obsVector.size(); jj++) {
     const t_pppSatObs* satObs = obsVector[jj];
     char sys = satObs->prn().system();
-    if (!_usedSystems.contains(sys)) {
-      _usedSystems.append(sys);
-    }
+    _usedSystems[sys]++;
   }
 
@@ -438 +450 @@
                 par->type() == t_pppParam::cBiasG2 ||
                 par->type() == t_pppParam::pBiasG1 ||
-                par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('G')) {
+                par->type() == t_pppParam::pBiasG2) && !_usedSystems.value('G')) {
 #ifdef BNC_DEBUG_PPP
        //LOG << "remove1 " << par->toString() << std::endl;
@@ -448 +460 @@
                 par->type() == t_pppParam::cBiasR2 ||
                 par->type() == t_pppParam::pBiasR1 ||
-                par->type() == t_pppParam::pBiasR2) && !usedSystems().contains('R')) {
+                par->type() == t_pppParam::pBiasR2) && !_usedSystems.value('R')){
 #ifdef BNC_DEBUG_PPP
         //LOG << "remove1 " << par->toString() << std::endl;
@@ -458 +470 @@
                 par->type() == t_pppParam::cBiasE2 ||
                 par->type() == t_pppParam::pBiasE1 ||
-                par->type() == t_pppParam::pBiasE2) && !usedSystems().contains('E')) {
+                par->type() == t_pppParam::pBiasE2) && !_usedSystems.value('E')) {
 #ifdef BNC_DEBUG_PPP
         //LOG << "remove1 " << par->toString() << std::endl;
@@ -468 +480 @@
                 par->type() == t_pppParam::cBiasC2 ||
                 par->type() == t_pppParam::pBiasC1 ||
-                par->type() == t_pppParam::pBiasC2) && !usedSystems().contains('C')) {
+                par->type() == t_pppParam::pBiasC2) && !_usedSystems.value('C')) {
 #ifdef BNC_DEBUG_PPP
         //LOG << "remove1 " << par->toString() << std::endl;
@@ -497 +509 @@
   // GLONASS Clock Offset
   // --------------------
-  if (OPT->useSystem('R')) {
+  if ( _usedSystems.value('R')  &&
+      (_usedSystems.value('G') || _usedSystems.value('E') || _usedSystems.value('C'))) {
     required.push_back(new t_pppParam(t_pppParam::offGlo, t_prn(), t_lc::dummy));
+  }
+  else {
+    PPP_CLIENT->resetOffGlo();
   }
 
   // Galileo Clock Offset
   // --------------------
-  if (OPT->useSystem('E')) {
+  if (_usedSystems.value('E') && _usedSystems.value('G') && _usedSystems.value('G') >= OPT->_minObs) {
     required.push_back(new t_pppParam(t_pppParam::offGal, t_prn(), t_lc::dummy));
+  }
+  else {
+    PPP_CLIENT->resetOffGal();
+  }
+
+  // GPS Clock Offset
+  // --------------------
+  if (_usedSystems.value('E') && _usedSystems.value('G') && _usedSystems.value('G') < OPT->_minObs) {
+    required.push_back(new t_pppParam(t_pppParam::offGps, t_prn(), t_lc::dummy));
+  }
+  else {
+    PPP_CLIENT->resetOffGps();
   }
 
   // BDS Clock Offset
   // ----------------
-  if (OPT->useSystem('C')) {
+  if (_usedSystems.contains('C')  &&
+      (_usedSystems.contains('G') || _usedSystems.contains('E'))) {
     required.push_back(new t_pppParam(t_pppParam::offBds, t_prn(), t_lc::dummy));
+  }
+  else {
+    PPP_CLIENT->resetOffBds();
   }