Changeset 9395 in ntrip for trunk/BNC/src/PPP/pppClient.cpp

Timestamp:

Mar 30, 2021, 9:59:17 AM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

• trunk/BNC/src/PPP/pppClient.cpp (modified) (10 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -634 +634 @@
           return finish(failure);
         }
-        if (_obsPool->refSatChanged()) {
+        if (_obsPool->refSatChanged() &&
+            _opt->_obsModelType  != t_pppOptions::UncombPPP) {
             epochReProcessing = true;
             continue;
@@ -665 +666 @@
       // Epoch re-processing required?
       // -----------------------------
-      if (_obsPool->refSatChangeRequired()) {//SLIP
+      if (_obsPool->refSatChangeRequired() && //SLIP
+          _opt->_obsModelType  != t_pppOptions::UncombPPP) {
         epochReProcessing = true;
         _obsPool->deleteLastEpoch();
@@ -777 +779 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::setRefSatellites(std::vector<t_pppSatObs*>& obsVector) {
-
+  t_irc  refSatReDefinition = success;
   // reference satellite definition per system
   for (unsigned iSys = 0; iSys < _opt->systems().size(); iSys++) {
@@ -789 +791 @@
       }
       // reference satellite is unchanged
+      // ================================
       if      (!_obsPool->refSatChangeRequired(sys) && refSat->prn() == satObs->prn()) {
         refSatDefined = true;
@@ -797 +800 @@
       }
       // reference satellite has changed
-      else if ( _obsPool->refSatChangeRequired(sys) &&
-                refSat->prn() != satObs->prn() &&
-                !_historicalRefSats[sys].contains(satObs->prn())) {
+      // ===============================
+      else if ( _obsPool->refSatChangeRequired(sys) && refSat->prn() != satObs->prn()) {
         if (satObs->prn().system() == sys) {
-          refSatDefined = true;
-          obsVector[ii]->setAsReference();
-          refSat->setPrn(satObs->prn());
+          if (!_historicalRefSats[sys].contains(satObs->prn())) {
+            refSatDefined = true;
+            obsVector[ii]->setAsReference();
+            refSat->setPrn(satObs->prn());
 #ifdef BNC_DEBUG_PPP
           LOG << "=> set refsatprn: "  <<  satObs->prn().toString() << endl;
 #endif
+          }
+          else if ( _historicalRefSats[sys].contains(satObs->prn())) {
+            refSatReDefinition = failure;
+          }
         }
       }
@@ -816 +823 @@
       }
     }
+
+    if ((!refSatDefined) && (refSatReDefinition == failure)) {
+      refSat->setPrn(t_prn(sys, 99));
+      continue;
+    }
+
     // reference satellite has to be initialized
+    // =========================================
     if (!refSatDefined) {
       for (unsigned ii = 0; ii < obsVector.size(); ii++) {
@@ -823 +837 @@
           continue;
         }
-        if (satObs->prn().system() == sys &&
-            !_historicalRefSats[sys].contains(satObs->prn())) {
+        if (satObs->prn().system() == sys) {
           obsVector[ii]->setAsReference();
           refSat->setPrn(satObs->prn());
@@ -838 +851 @@
       }
     }
-    if (!refSatDefined) {
+
+    if (!refSatDefined) { // no observations for that system
       refSat->setPrn(t_prn());
     }
@@ -858 +872 @@
     char  sys = it.key();
     t_prn prn = it.value()->prn();
-    if (prn.number() == 0) {
+    if      (prn.number() ==  0) { // no obs for that system available
+      continue;
+    }
+    else if (prn.number() == 99) { // refSat re-definition not possible
       return failure;
     }
@@ -885 +902 @@
       _historicalRefSats[sys].append(prn);
     }
-  }
-}
+  }}
 
 //