Changeset 9559 in ntrip for trunk/BNC/src/PPP

Timestamp:

Dec 1, 2021, 5:47:15 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src/PPP

Files:

• pppParlist.cpp (modified) (6 diffs)
• pppParlist.h (modified) (1 diff)
• pppSatObs.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -102 +102 @@
       _noise   = OPT->_noiseIon;
      break;
-   case cBiasG1:   case cBiasR1:   case cBiasE1:   case cBiasC1:
-   case cBiasG2:   case cBiasR2:   case cBiasE2:   case cBiasC2:
+   case cBiasG1:   case cBiasE1:   case cBiasC1:
+   case cBiasG2:   case cBiasE2:   case cBiasC2:
      _epoSpec = false;
      _sigma0  = OPT->_aprSigCodeBias;
@@ -246 +246 @@
     if ((obs->prn().system() == 'G') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;}
     break;
-  case cBiasR1:
-    if ((obs->prn().system() == 'R') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;}
-    break;
   case cBiasE1:
     if ((obs->prn().system() == 'E') && (tLC == t_lc::c1)) {return 1.0;} else {return 0.0;}
@@ -257 +254 @@
   case cBiasG2:
     if ((obs->prn().system() == 'G') && (tLC == t_lc::c2)) {return 1.0;} else {return 0.0;}
-    break;
-  case cBiasR2:
-    if ((obs->prn().system() == 'R') && (tLC == t_lc::c2)) {return 1.0;} else {return 0.0;}
     break;
   case cBiasE2:
@@ -328 +322 @@
   case cBiasG2:  case pBiasG2:
     ss << "BIA  " << left << setw(3) << t_lc::toString(_tLC) << right << " G  ";
-    break;
-  case cBiasR1:
-  case cBiasR2:
-    ss << "BIA  " << left << setw(3) << t_lc::toString(_tLC) << right << " R  ";
     break;
   case cBiasE1:  case pBiasE1:
@@ -519 +509 @@
         it = _params.erase(it);
       }
-      else if ((par->type() == t_pppParam::cBiasR1 ||
-                par->type() == t_pppParam::cBiasR2) && !usedSystems().contains('R')) {
-#ifdef BNC_DEBUG_PPP
-        LOG << "remove1 " << par->toString() << std::endl;
-#endif
-        delete par;
-        it = _params.erase(it);
-      }
       else if ((par->type() == t_pppParam::cBiasE1 ||
                 par->type() == t_pppParam::cBiasE2 ||
@@ -594 +576 @@
       }
     }
-    if (_usedSystems.contains('R')) {
-      lc = OPT->LCs('R');
-      if (std::find(lc.begin(), lc.end(), t_lc::c1) != lc.end()) {
-        required.push_back(new t_pppParam(t_pppParam::cBiasR1, t_prn(), t_lc::c1));
-      }
-      if (std::find(lc.begin(), lc.end(), t_lc::c2) != lc.end()) {
-        required.push_back(new t_pppParam(t_pppParam::cBiasR2, t_prn(), t_lc::c2));
-      }
-    }
     if (_usedSystems.contains('E')) {
       lc = OPT->LCs('E');

trunk/BNC/src/PPP/pppParlist.h

@@ -16 +16 @@
  public:
   enum e_type {crdX, crdY, crdZ, rClkG, rClkR, rClkE, rClkC, trp, ion, amb,
-               cBiasG1, cBiasR1, cBiasE1, cBiasC1, pBiasG1, pBiasE1, pBiasC1,
-               cBiasG2, cBiasR2, cBiasE2, cBiasC2, pBiasG2, pBiasE2, pBiasC2};
+               cBiasG1, cBiasE1, cBiasC1, pBiasG1, pBiasE1, pBiasC1,
+               cBiasG2, cBiasE2, cBiasC2, pBiasG2, pBiasE2, pBiasC2};
 
   t_pppParam(e_type type, const t_prn& prn, t_lc::type tLC, const std::vector<t_pppSatObs*>* obsVector = 0);

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -65 +65 @@
   // Select pseudo-ranges and phase observations
   // -------------------------------------------
-  const string preferredAttrib = "G:12&PWCSLXYN R:12&PC E:1&BCX E:5&IQX C:IQX";
+  const string preferredAttrib = "G:12&W R:12&P E:1&CX E:5&QX C:26&I";
 
   for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {