Changeset 9486 in ntrip for trunk

Timestamp:

Jul 27, 2021, 10:50:31 AM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src

Files:

• PPP/pppParlist.cpp (modified) (1 diff)
• PPP/pppSatObs.cpp (modified) (2 diffs)
• pppMain.cpp (modified) (1 diff)
• pppOptions.h (modified) (1 diff)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -119 +119 @@
    case cBiasG1:   case cBiasR1:   case cBiasE1:   case cBiasC1:
    case cBiasG2:   case cBiasR2:   case cBiasE2:   case cBiasC2:
-     _epoSpec = true;
+     _epoSpec = false;
      _sigma0  = OPT->_aprSigCodeBias;
+     _noise   = OPT->_noiseCodeBias;
      break;
    case pBiasG1:   case pBiasE1:   case pBiasR1:   case pBiasC1:
    case pBiasG2:   case pBiasE2:   case pBiasR2:   case pBiasC2:
-     _epoSpec = true;
+     _epoSpec = false;
      _sigma0  = OPT->_aprSigPhaseBias;
+     _noise   = OPT->_noisePhaseBias;
      break;
   }

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -324 +324 @@
   // -------------
   if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
-    retVal *= 2.0;
+    retVal *= 5.0;
   }
 
@@ -366 +366 @@
 
   retVal = sqrt(retVal);
+
+  // 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 *= 5.0;
+  }
+
 
   return retVal;

trunk/BNC/src/pppMain.cpp

@@ -340 +340 @@
     // Some default values
     // -------------------
-    opt->_aprSigAmb       = 1000.0;
-    opt->_aprSigIon       = 1000.0;
-    opt->_aprSigClk       = 1000.0;
-    opt->_aprSigOGR       = 1000.0;
-    opt->_aprSigOGE       = 1000.0;
-    opt->_aprSigOGC       = 1000.0;
-    opt->_aprSigCodeBias  = 1000.0;
-    opt->_aprSigPhaseBias = 1000.0;
+    opt->_aprSigAmb       = 1e4;
+    opt->_aprSigIon       = 1e4;
+    opt->_aprSigClk       = 3e5;
+    opt->_aprSigOGR       = 1e4;
+    opt->_aprSigOGE       = 1e4;
+    opt->_aprSigOGC       = 1e4;
+    opt->_aprSigCodeBias  = 1e4;
+    opt->_aprSigPhaseBias = 1e4;
+
+    opt->_noiseIon        = 1e4; // maybe: comment for uncombined PPP
+    opt->_noiseCodeBias   = 1e4;
+    opt->_noisePhaseBias  = 1e4;
 
     _options << opt;

trunk/BNC/src/pppOptions.h

@@ -60 +60 @@
   int                     _minObs;
   ColumnVector            _aprSigCrd;
-  ColumnVector            _noiseCrd;
   double                  _aprSigClk;
+  double                  _aprSigTrp;
+  double                  _aprSigIon;
   double                  _aprSigOGR;
   double                  _aprSigOGE;
   double                  _aprSigOGC;
-  double                  _aprSigTrp;
+  double                  _aprSigAmb;
+  double                  _aprSigCodeBias;
+  double                  _aprSigPhaseBias;
+  ColumnVector            _noiseCrd;
   double                  _noiseTrp;
   double                  _noiseIon;
-  double                  _aprSigIon;
-  double                  _aprSigCodeBias;
-  double                  _aprSigPhaseBias;
+  double                  _noiseCodeBias;
+  double                  _noisePhaseBias;
   int                     _nmeaPort;
-  double                  _aprSigAmb;
   double                  _seedingTime;
   std::vector<t_lc::type> _LCsGPS;