Changeset 9386 in ntrip for trunk/BNC/src/PPP/pppSatObs.cpp

Timestamp:

Mar 25, 2021, 3:17:35 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

File:

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

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -63 +63 @@
 
   // Select pseudoranges and phase observations
-  // ------------------------------------------
+  // -------------------------------------------
   const string preferredAttrib = "G:12&PWCSLXYN G:5&IQX R:12&PC R:3&IQX E:16&BCX E:578&IQX J:1&SLXCZ J:26&SLX J:5&IQX C:IQX I:ABCX S:1&C S:5&IQX";
 
@@ -296 +296 @@
 
   if (tLC == t_lc::GIM) {
-    retVal = OPT->_sigmaGIM * OPT->_sigmaGIM;
+    retVal = OPT->_sigmaGIM * OPT->_sigmaGIM + OPT->_sigmaGIM * OPT->_sigmaGIM;
   }
 
@@ -304 +304 @@
 
   map<t_frequency::type, double>::const_iterator it;
-  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {//qDebug() << "codeCoeff : " << t_frequency::toString(it->first).c_str() << ": " << it->second;
+  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {//cout << "codeCoeff : " << t_frequency::toString(it->first).c_str() << ": " << it->second << endl;
     retVal += it->second * it->second * OPT->_sigmaC1 * OPT->_sigmaC1;
   }
 
-  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {//qDebug() << "phaseCoeff: " << t_frequency::toString(it->first).c_str()  << ": " << it->second;
+  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {//cout << "phaseCoeff: " << t_frequency::toString(it->first).c_str()  << ": " << it->second << endl;
     retVal += it->second * it->second * OPT->_sigmaL1 * OPT->_sigmaL1;
   }
@@ -316 +316 @@
   // De-Weight GLONASS and BDS
   // --------------------------
-  if (_prn.system() == 'R' ||
-      _prn.system() == 'C') {
+  if ((_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) ||
+      (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC)))) {  
     retVal *= 5.0;
   }
@@ -336 +336 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-double t_pppSatObs::maxRes(t_lc::type tLC) const {//qDebug() << "t_pppSatObs::maxRes(t_lc::type tLC)";
+double t_pppSatObs::maxRes(t_lc::type tLC) const {
   double retVal = 0.0;
 
@@ -345 +345 @@
 
   map<t_frequency::type, double>::const_iterator it;
-  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {//qDebug() << "codeCoeff: " << it->first << ": " << it->second;
+  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {//cout << "codeCoeff: " << it->first << ": " << it->second << endl;
     retVal += it->second * it->second * OPT->_maxResC1 * OPT->_maxResC1;
   }
-  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {//qDebug() << "phaseCoeff: " << it->first << ": " << it->second;
+  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {//cout << "phaseCoeff: " << it->first << ": " << it->second << endl;
     retVal += it->second * it->second * OPT->_maxResL1 * OPT->_maxResL1;
   }
   if (tLC == t_lc::GIM) {
-    retVal = 3.0 * OPT->_sigmaGIM * OPT->_sigmaGIM;
+    retVal = 3.0 * (OPT->_sigmaGIM * OPT->_sigmaGIM + OPT->_sigmaGIM * OPT->_sigmaGIM);
   }
   if (tLC == t_lc::Tz0) {
     retVal = 3.0 * OPT->_sigmaTz0 * OPT->_sigmaTz0;
   }
-  return sqrt(retVal);
+
+  retVal = sqrt(retVal);
+
+  return retVal;
 }