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

Timestamp:

May 3, 2021, 2:18:39 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

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

trunk/BNC/src/PPP/pppParlist.cpp

@@ -121 +121 @@
      _sigma0  = OPT->_aprSigCodeBias;
      break;
-   case pBiasG1:   case pBiasE1:   case pBiasC1:
-   case pBiasG2:   case pBiasE2:   case pBiasC2:
+   case pBiasG1:   case pBiasE1:   case pBiasR1:   case pBiasC1:
+   case pBiasG2:   case pBiasE2:   case pBiasR2:   case pBiasC2:
      _epoSpec = true;
      _sigma0  = OPT->_aprSigPhaseBias;
@@ -261 +261 @@
     if ((obs->prn().system() == 'G') && (tLC == t_lc::l1)) {return 1.0;} else {return 0.0;}
     break;
+  case pBiasR1:
+    if ((obs->prn().system() == 'R') && (tLC == t_lc::l1)) {return 1.0;} else {return 0.0;}
+    break;
   case pBiasE1:
     if ((obs->prn().system() == 'E') && (tLC == t_lc::l1)) {return 1.0;} else {return 0.0;}
@@ -269 +272 @@
   case pBiasG2:
     if ((obs->prn().system() == 'G') && (tLC == t_lc::l2)) {return 1.0;} else {return 0.0;}
+    break;
+  case pBiasR2:
+    if ((obs->prn().system() == 'R') && (tLC == t_lc::l2)) {return 1.0;} else {return 0.0;}
     break;
   case pBiasE2:
@@ -320 +326 @@
     ss << "BIA  " << left << setw(3) << t_lc::toString(_tLC) << right << " G  ";
     break;
-  case cBiasR1:
-  case cBiasR2:
+  case cBiasR1:  case pBiasR1:
+  case cBiasR2:  case pBiasR2:
     ss << "BIA  " << left << setw(3) << t_lc::toString(_tLC) << right << " R  ";
     break;
@@ -351 +357 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_pppParlist::set(const bncTime& epoTime,
-    const std::vector<t_pppSatObs*>& obsVector,
+t_irc t_pppParlist::set(const bncTime& epoTime, const std::vector<t_pppSatObs*>& obsVector,
     const QMap<char, t_pppRefSat*>& refSatMap) {
 
@@ -374 +379 @@
       }
     }
+
     else if (par->type() == t_pppParam::amb) {
-      char system = par->prn().system();
-      t_prn refPrn = t_prn();
-      if (OPT->_refSatRequired) {
-        refPrn = (refSatMap[system])->prn();
-      }
-      if ((par->lastObsTime().valid() &&
-          (epoTime - par->lastObsTime() > 60.0)) ||
-          (refPrn == par->prn())) {
-        remove = true;
+      if (OPT->_obsModelType == OPT->DCMcodeBias ||  OPT->_obsModelType == OPT->DCMphaseBias) {
+        t_prn refPrn = (refSatMap[par->prn().system()])->prn();
+        if (par->lastObsTime().valid() &&
+            ((epoTime - par->lastObsTime() > 1.0) || (par->prn() == refPrn))) {
+            remove = true;
+        }
+      }
+      else {
+        if (par->lastObsTime().valid() && (epoTime - par->lastObsTime() > 60.0)) {
+            remove = true;
+        }
       }
     }
@@ -420 +428 @@
   }
 
+  // Check if ambiguity parameters have observations
+  // -----------------------------------------------
+  if (OPT->_obsModelType == OPT->DCMcodeBias ||
+      OPT->_obsModelType == OPT->DCMphaseBias) {
+    vector<t_pppParam*>::iterator it = _params.begin();
+    while (it != _params.end()) {
+      t_pppParam* par = *it;
+      bool remove = false;
+      if (par->type() == t_pppParam::amb && !par->lastObsTime().valid()) {
+        remove = true;
+      }
+      if (remove) {
+        delete par;
+        it = _params.erase(it);
+      }
+      else {
+        ++it;
+      }
+    }
+  }
+
+  // check which systems have observations
+  // -------------------------------------
+  _usedSystems.clear();
+  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);
+    }
+  }
+
+  if (_usedSystems.size() > 1 &&
+      !_usedSystems.contains('G')) { // required to setup ISB w. r. t. GPS
+    return failure;
+  }
+
   // Required Set of Parameters
   // --------------------------
@@ -433 +478 @@
   // --------------------
   if (OPT->_obsModelType == OPT->DCMcodeBias) {
-    if (OPT->useSystem('G')) {
+    if (_usedSystems.contains('G')) {
       required.push_back(new t_pppParam(t_pppParam::cBiasG1, t_prn(), t_lc::c1));
       required.push_back(new t_pppParam(t_pppParam::cBiasG2, t_prn(), t_lc::c2));
     }
-    if (OPT->useSystem('R')) {
+    if (_usedSystems.contains('R')) {
       required.push_back(new t_pppParam(t_pppParam::cBiasR1, t_prn(), t_lc::c1));
       required.push_back(new t_pppParam(t_pppParam::cBiasR2, t_prn(), t_lc::c2));
     }
-    if (OPT->useSystem('E')) {
+    if (_usedSystems.contains('E')) {
       required.push_back(new t_pppParam(t_pppParam::cBiasE1, t_prn(), t_lc::c1));
       required.push_back(new t_pppParam(t_pppParam::cBiasE2, t_prn(), t_lc::c2));
     }
-    if (OPT->useSystem('C')) {
+    if (_usedSystems.contains('C')) {
       required.push_back(new t_pppParam(t_pppParam::cBiasC1, t_prn(), t_lc::c1));
       required.push_back(new t_pppParam(t_pppParam::cBiasC2, t_prn(), t_lc::c2));
@@ -455 +500 @@
   if ((OPT->_obsModelType == OPT->DCMphaseBias) ||
       (OPT->_obsModelType == OPT->PPPRTK)     ) {
-    if (OPT->useSystem('G')) {
+    if (_usedSystems.contains('G')) {
       required.push_back(new t_pppParam(t_pppParam::pBiasG1, t_prn(), t_lc::l1));
       required.push_back(new t_pppParam(t_pppParam::pBiasG2, t_prn(), t_lc::l2));
     }
-    if (OPT->useSystem('E')) {
+    if (_usedSystems.contains('R')) {
+      required.push_back(new t_pppParam(t_pppParam::pBiasR1, t_prn(), t_lc::l1));
+      required.push_back(new t_pppParam(t_pppParam::pBiasR2, t_prn(), t_lc::l2));
+    }
+    if (_usedSystems.contains('E')) {
       required.push_back(new t_pppParam(t_pppParam::pBiasE1, t_prn(), t_lc::l1));
       required.push_back(new t_pppParam(t_pppParam::pBiasE2, t_prn(), t_lc::l2));
     }
-    if (OPT->useSystem('C')) {
+    if (_usedSystems.contains('C')) {
       required.push_back(new t_pppParam(t_pppParam::pBiasC1, t_prn(), t_lc::l1));
       required.push_back(new t_pppParam(t_pppParam::pBiasC2, t_prn(), t_lc::l2));
     }
   }
+
   // Receiver Clock
   // --------------
@@ -474 +524 @@
   // GPS-GLONASS Clock Offset
   // ------------------------
-  if (OPT->useSystem('R') && OPT->useSystem('G')) {
+  if (_usedSystems.contains('G') && _usedSystems.contains('R')) {
     required.push_back(new t_pppParam(t_pppParam::offGR, t_prn(), t_lc::dummy));
   }
 
-  // GPS-Galileo Clock Offset
+  //GPS-Galileo Clock Offset
   // ------------------------
-  if (OPT->useSystem('E') && OPT->useSystem('G')) {
+  if (_usedSystems.contains('G') && _usedSystems.contains('E')) {
     required.push_back(new t_pppParam(t_pppParam::offGE, t_prn(), t_lc::dummy));
   }
@@ -486 +536 @@
   // GPS-BDS Clock Offset
   // ------------------------
-  if (OPT->useSystem('C') && OPT->useSystem('G')) {
+  if (_usedSystems.contains('G') && _usedSystems.contains('C')) {
     required.push_back(new t_pppParam(t_pppParam::offGC, t_prn(), t_lc::dummy));
   }
@@ -509 +559 @@
   // -----------
   for (unsigned jj = 0; jj < obsVector.size(); jj++) {
-    const t_pppSatObs*        satObs = obsVector[jj];
+    const t_pppSatObs*  satObs = obsVector[jj];
     if ((OPT->_obsModelType == OPT->IF)        ||
         (OPT->_obsModelType == OPT->PPPRTK)    ||