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

Timestamp:

Nov 27, 2020, 10:38:03 AM (3 years ago)

Author:

stuerze

Message:

updates regarding inter system biases

File:

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

trunk/BNC/src/PPP/pppParlist.cpp

@@ -74 +74 @@
          const t_pppSatObs* obs = obsVector->at(ii);
          if (obs->prn() == _prn) {
-           double offGG = 0;
+           double offGR = 0;
            if (_prn.system() == 'R' && tLC != t_lc::MW) {
-             offGG = PPP_CLIENT->offGG();
+             offGR = PPP_CLIENT->offGR();
            }
-           double offGB = 0;
+           double offGE = 0;
+           if (_prn.system() == 'E' && tLC != t_lc::MW) {
+             offGE = PPP_CLIENT->offGE();
+           }
+           double offGC = 0;
            if (_prn.system() == 'C' && tLC != t_lc::MW) {
-             offGB = PPP_CLIENT->offGB();
+             offGC = PPP_CLIENT->offGC();
            }
-           _x0 = floor((obs->obsValue(tLC) - offGG - offGB - obs->cmpValue(tLC)) / obs->lambda(tLC) + 0.5);
+           _x0 = floor((obs->obsValue(tLC) - offGR -offGE - offGC - obs->cmpValue(tLC)) / obs->lambda(tLC) + 0.5);
            break;
          }
@@ -88 +92 @@
      }
      break;
-   case offGG:
+   case offGR:
      _epoSpec = true;
      _sigma0  = 1000.0;
-     _x0      = PPP_CLIENT->offGG();
-     break;
-   case offGB:
+     _x0      = PPP_CLIENT->offGR();
+     break;
+   case offGE:
      _epoSpec = true;
      _sigma0  = 1000.0;
-     _x0      = PPP_CLIENT->offGB();
+     _x0      = PPP_CLIENT->offGE();
+     break;
+   case offGC:
+     _epoSpec = true;
+     _sigma0  = 1000.0;
+     _x0      = PPP_CLIENT->offGC();
      break;
    case trp:
@@ -161 +170 @@
     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     return 1.0;
-  case offGG:
+  case offGR:
     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     return (obs->prn().system() == 'R') ? 1.0 : 0.0;
-  case offGB:
+  case offGE:
+    if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
+    return (obs->prn().system() == 'E') ? 1.0 : 0.0;
+  case offGC:
     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     return (obs->prn().system() == 'C') ? 1.0 : 0.0;
@@ -276 +288 @@
     ss << "REC_CLK    ";
     break;
-  case offGG:
+  case offGR:
     ss << "OGG        ";
     break;
-  case offGB:
+  case offGE:
+    ss << "OGE        ";
+    break;
+  case offGC:
     ss << "OGB        ";
     break;
@@ -401 +416 @@
   // ------------------------
   if (OPT->useSystem('R')) {
-    required.push_back(new t_pppParam(t_pppParam::offGG, t_prn(), t_lc::dummy));
+    required.push_back(new t_pppParam(t_pppParam::offGR, t_prn(), t_lc::dummy));
+  }
+
+  // GPS-Galileo Clock Offset
+  // ------------------------
+  if (OPT->useSystem('E')) {
+    required.push_back(new t_pppParam(t_pppParam::offGE, t_prn(), t_lc::dummy));
   }
 
@@ -407 +428 @@
   // ------------------------
   if (OPT->useSystem('C')) {
-    required.push_back(new t_pppParam(t_pppParam::offGB, t_prn(), t_lc::dummy));
-  }
-
+    required.push_back(new t_pppParam(t_pppParam::offGC, t_prn(), t_lc::dummy));
+  }
 
   // Troposphere