Changeset 9490 in ntrip for trunk/BNC/src

Timestamp:

Aug 4, 2021, 11:52:53 AM (3 years ago)

Author:

stuerze

Message:

minor changes regarding PPP

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (3 diffs)
• pppMain.cpp (modified) (3 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -793 +793 @@
 //////////////////////////////////////////////////////////////////////////////
 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++) {
+    t_irc  refSatReDefinition = success;
     char sys = _opt->systems()[iSys];
     bool refSatDefined = false;
@@ -831 +831 @@
       }
     }
+
     // all available satellites were already tried to use
     if ((!refSatDefined) && (refSatReDefinition == failure)) {
@@ -886 +887 @@
     }
     else if (prn.number() == 99) { // refSat re-definition not possible
-#ifdef BNC_DEBUG_PPP
-          LOG << " => refSat re-definition impossible: " << sys << endl;
-#endif
+      LOG << " => refSat re-definition impossible: " << sys << endl;
       return failure;
     }

trunk/BNC/src/pppMain.cpp

@@ -179 +179 @@
     opt->_blqFileName.assign(settings.value("PPP/blqFile").toString().toStdString());
 #endif
-    opt->_sigmaC1      = settings.value("PPP/sigmaC1").toDouble(); if (opt->_sigmaC1 <= 0.0)  opt->_sigmaC1  = 2.00;
+    opt->_sigmaC1      = settings.value("PPP/sigmaC1").toDouble(); if (opt->_sigmaC1 <= 0.0)  opt->_sigmaC1  = 1.00;
     opt->_sigmaL1      = settings.value("PPP/sigmaL1").toDouble(); if (opt->_sigmaL1 <= 0.0)  opt->_sigmaL1  = 0.01;
     opt->_sigmaGIM     = settings.value("PPP/sigmaGIM").toDouble();if (opt->_sigmaGIM <= 0.0) opt->_sigmaGIM = 4.00;
@@ -225 +225 @@
       opt->_obsModelType = t_pppOptions::DCMcodeBias;
       opt->_refSatRequired = true;
+      opt->_noiseIon       = 1e4;
+      opt->_noiseCodeBias  = 1e4;
     }
     else if (settings.value("PPP/modelObs").toString() == "DCM with Phase Biases") {
       opt->_obsModelType = t_pppOptions::DCMphaseBias;
       opt->_refSatRequired = true;
+      opt->_noisePhaseBias = 1e4;
     }
 #endif
@@ -349 +352 @@
     opt->_aprSigPhaseBias = 1e4;
 
-    opt->_noiseIon        = 1e4; // maybe: comment for uncombined PPP
-    opt->_noiseCodeBias   = 1e4;
-    opt->_noisePhaseBias  = 1e4;
-
     _options << opt;
   }