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

Timestamp:

Dec 10, 2024, 2:19:35 PM (3 days ago)

Author:

stuerze

Message:

changed in PPP mode from common receiver clock + ISBs to system specific receiver clocks

File:

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

trunk/BNC/src/PPP/pppParlist.cpp

@@ -62 +62 @@
      _noise   = OPT->_noiseCrd[2];
      break;
-   case rClk:
+   case rClkG:
+     _epoSpec = true;
+     _sigma0  = OPT->_aprSigClk;
+     break;
+   case rClkR:
+     _epoSpec = true;
+     _sigma0  = OPT->_aprSigClk;
+     break;
+   case rClkE:
+     _epoSpec = true;
+     _sigma0  = OPT->_aprSigClk;
+     break;
+   case rClkC:
      _epoSpec = true;
      _sigma0  = OPT->_aprSigClk;
@@ -73 +85 @@
          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) {
-             offGlo = PPP_CLIENT->offGlo();
-           }
-           double offGal = 0.0;
-           if (_prn.system() == 'E' && tLC != t_lc::MW) {
-             offGal = PPP_CLIENT->offGal();
-           }
-           double offBds = 0.0;
-           if (_prn.system() == 'C' && tLC != t_lc::MW) {
-             offBds = PPP_CLIENT->offBds();
-           }
-           _x0 = floor((obs->obsValue(tLC) - offGps - offGlo - offGal - offBds - obs->cmpValue(tLC)) / obs->lambda(tLC) + 0.5);
+           _x0 = floor((obs->obsValue(tLC) - obs->cmpValue(tLC)) / obs->lambda(tLC) + 0.5);
            break;
          }
        }
      }
-     break;
-   case offGps:
-     _epoSpec = true;
-     _sigma0  = OPT->_aprSigClkOff;
-     _x0      = PPP_CLIENT->offGps();
-     break;
-   case offGlo:
-     _epoSpec = true;
-     _sigma0  = OPT->_aprSigClkOff;
-     _x0      = PPP_CLIENT->offGlo();
-     break;
-   case offGal:
-     _epoSpec = true;
-     _sigma0  = OPT->_aprSigClkOff;
-     _x0      = PPP_CLIENT->offGal();
-     break;
-   case offBds:
-     _epoSpec = true;
-     _sigma0  = OPT->_aprSigClkOff;
-     _x0      = PPP_CLIENT->offBds();
      break;
    case trp:
@@ -174 +150 @@
     if (tLC == t_lc::GIM) {return 0.0;}
     return (sta->xyzApr()[2] - obs->xc()[2]) / rhoV.NormFrobenius();
-  case rClk:
-    if (tLC == t_lc::GIM) {return 0.0;}
-    return 1.0;
-  case offGps:
+  case rClkG:
     if (tLC == t_lc::GIM) {return 0.0;}
     return (obs->prn().system() == 'G') ? 1.0 : 0.0;
-  case offGlo:
+  case rClkR:
     if (tLC == t_lc::GIM) {return 0.0;}
     return (obs->prn().system() == 'R') ? 1.0 : 0.0;
-  case offGal:
+  case rClkE:
     if (tLC == t_lc::GIM) {return 0.0;}
     return (obs->prn().system() == 'E') ? 1.0 : 0.0;
-  case offBds:
+  case rClkC:
     if (tLC == t_lc::GIM) {return 0.0;}
     return (obs->prn().system() == 'C') ? 1.0 : 0.0;
@@ -305 +278 @@
     ss << "CRD_Z";
     break;
-  case rClk:
-    ss << "REC_CLK     ";
-    break;
-  case offGps:
-    ss << "OFF_GPS     ";
-    break;
-  case offGlo:
-    ss << "OFF_GLO     ";
-    break;
-  case offGal:
-    ss << "OFF_GAL     ";
-    break;
-  case offBds:
-    ss << "OFF_BDS     ";
+  case rClkG:
+    ss << "REC_CLK  G  ";
+    break;
+  case rClkR:
+    ss << "REC_CLK  R  ";
+    break;
+  case rClkE:
+    ss << "REC_CLK  E  ";
+    break;
+  case rClkC:
+    ss << "REC_CLK  C  ";
     break;
   case trp:
@@ -458 +428 @@
   // Receiver Clocks
   // ---------------
-  required.push_back(new t_pppParam(t_pppParam::rClk, t_prn(), t_lc::dummy));
-
-  // GLONASS Clock Offset
-  // --------------------
-  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 (_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 (_usedSystems.value('C')  &&
-      (_usedSystems.value('G') || _usedSystems.value('E'))) {
-    required.push_back(new t_pppParam(t_pppParam::offBds, t_prn(), t_lc::dummy));
-  }
-  else {
-    PPP_CLIENT->resetOffBds();
-  }
+   if (_usedSystems.contains('G')) {
+     required.push_back(new t_pppParam(t_pppParam::rClkG, t_prn(), t_lc::dummy));
+   }
+
+   if (_usedSystems.contains('R')) {
+     required.push_back(new t_pppParam(t_pppParam::rClkR, t_prn(), t_lc::dummy));
+   }
+
+   if (_usedSystems.contains('E')) {
+     required.push_back(new t_pppParam(t_pppParam::rClkE, t_prn(), t_lc::dummy));
+   }
+
+   if (_usedSystems.contains('C')) {
+     required.push_back(new t_pppParam(t_pppParam::rClkC, t_prn(), t_lc::dummy));
+   }
 
   // Troposphere