Changeset 9562 in ntrip for trunk/BNC/src

Timestamp:

Dec 3, 2021, 3:25:41 PM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src

Files:

• PPP/pppFilter.cpp (modified) (2 diffs)
• PPP/pppSatObs.cpp (modified) (2 diffs)
• pppMain.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -355 +355 @@
           if (par) {
             par->setAmbResetCandidate();
+            obs->setOutlier();
+          }
+          else {
+            obs->setOutlier();
           }
         }
@@ -782 +786 @@
   _xFlt =  _datumTrafo->D21() * xFltOld;
 
-#ifdef BNC_DEBUG_PPP
-  //LOG << "xFltOld:\n" << xFltOld << endl;
-  //LOG << "xFlt   :\n" << _xFlt   << endl;
-#endif
+//#ifdef BNC_DEBUG_PPP
+  LOG << "xFltOld:\n" << xFltOld << endl;
+  LOG << "xFlt   :\n" << _xFlt   << endl;
+//#endif
 
   // Reset Ambiguities after Datum Transformation

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -68 +68 @@
   if (OPT->_obsModelType == OPT->DCMcodeBias ||
       OPT->_obsModelType == OPT->DCMphaseBias) {
-    // at the moment only one code or phase bias per system (G,E,C)/modulation considered,
-    preferredAttrib = "G:12&W R:12&PC E:1&CX E:5&QX C:26&I";
+    // at the moment only one code or phase bias per system (G,R,E,C)/modulation considered,
+    preferredAttrib = "G:12&W R:12&P E:1&CX E:5&QX C:26&I";
   }
 
@@ -313 +313 @@
   // De-Weight GLONASS code measurements
   // -----------------------------------
-  if (_prn.system() == 'R'  && t_lc::includesCode(tLC) ) {
+  if (_prn.system() == 'R'  &&
+      (t_lc::includesCode(tLC) || t_lc::includesPhase(tLC) )) {
     retVal *= 5.0;
+  }
+  if (_prn.system() == 'C'  &&
+      (t_lc::includesCode(tLC) || t_lc::includesPhase(tLC) )) {
+    retVal *= 2.0;
   }
 

trunk/BNC/src/pppMain.cpp

@@ -216 +216 @@
       opt->_obsModelType = t_pppOptions::DCMcodeBias;
       opt->_refSatRequired = true;
-      opt->_noiseCodeBias  = 100.0;
+      opt->_noiseCodeBias  = 1000.0;
       opt->_noiseIon = 0.1;
     }
@@ -222 +222 @@
       opt->_obsModelType = t_pppOptions::DCMphaseBias;
       opt->_refSatRequired = true;
-      opt->_noisePhaseBias = 100.0;
+      opt->_noisePhaseBias = 1000.0;
       opt->_noiseIon = 0.1;
     }