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

Timestamp:

Jul 13, 2021, 10:11:20 PM (3 years ago)

Author:

stuerze

Message:

minor changes

File:

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

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -17 +17 @@
 
 #include <iostream>
+#include <iomanip>
 #include <cmath>
 #include <newmatio.h>
@@ -304 +305 @@
 
   map<t_frequency::type, double>::const_iterator it;
-  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {//cout << "codeCoeff : " << t_frequency::toString(it->first).c_str() << ": " << it->second << endl;
+  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {
     retVal += it->second * it->second * OPT->_sigmaC1 * OPT->_sigmaC1;
   }
 
-  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {//cout << "phaseCoeff: " << t_frequency::toString(it->first).c_str()  << ": " << it->second << endl;
+  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {
     retVal += it->second * it->second * OPT->_sigmaL1 * OPT->_sigmaL1;
   }
@@ -314 +315 @@
   retVal = sqrt(retVal);
 
-  // De-Weight GLONASS and BDS
-  // --------------------------
-  if ((_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) ||
-      (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC)))) {
+  // De-Weight GLONASS
+  // -----------------
+  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
     retVal *= 5.0;
   }
+
+  // De-Weight BDS
+  // -------------
+  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
+    retVal *= 2.0;
+  }
+
 
   // Elevation-Dependent Weighting
@@ -345 +352 @@
 
   map<t_frequency::type, double>::const_iterator it;
-  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {//cout << "codeCoeff: " << it->first << ": " << it->second << endl;
+  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++)   {
     retVal += it->second * it->second * OPT->_maxResC1 * OPT->_maxResC1;
   }
-  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {//cout << "phaseCoeff: " << it->first << ": " << it->second << endl;
+  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {
     retVal += it->second * it->second * OPT->_maxResL1 * OPT->_maxResL1;
   }