Changeset 6115 in ntrip for trunk/BNC/src/PPP_free

Timestamp:

Sep 8, 2014, 5:41:17 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP_free/pppFilter.cpp (modified) (4 diffs)

trunk/BNC/src/PPP_free/pppFilter.cpp

@@ -55 +55 @@
 using namespace std;
 
-const unsigned MINOBS                = 5;
-const double   MINELE                = 10.0 * M_PI / 180.0;
-const double   MAXRES_CODE           = 15.0;
-const double   MAXRES_PHASE_GPS      = 0.04;
-const double   MAXRES_PHASE_GLONASS  = 0.08;
-const double   GLONASS_WEIGHT_FACTOR = 5.0;
+const double   MAXRES_CODE           = 2.98 * 3.0;
+const double   MAXRES_PHASE_GPS      = 2.98 * 0.03;
+const double   MAXRES_PHASE_GLONASS  = 2.98 * 0.03;
+const double   GLONASS_WEIGHT_FACTOR = 1.0;
 
 #define LOG (_pppClient->log())
@@ -255 +253 @@
   Tracer tracer("t_pppFilter::cmpBancroft");
 
-  if (epoData->sizeSys('G') < MINOBS) {
+  if (epoData->sizeSys('G') < OPT->_minObs) {
     LOG << "t_pppFilter::cmpBancroft: not enough data\n";
     return failure;
@@ -290 +288 @@
     t_satData* satData = im.value();
     cmpEle(satData);
-    if (satData->eleSat < MINELE) {
+    if (satData->eleSat < OPT->_minEle) {
       delete satData;
       im.remove();
@@ -684 +682 @@
 
   if      (iPhase == 1) {
-    if      (maxResGlo > MAXRES_PHASE_GLONASS) { 
+    if      (maxResGlo > 2.98 * OPT->_maxResL1) { 
       LOG << "Outlier Phase " << prnGlo.toAscii().data() << ' ' << maxResGlo << endl;
       return prnGlo;
     }
-    else if (maxResGPS > MAXRES_PHASE_GPS) { 
+    else if (maxResGPS > 2.98 * OPT->_maxResL1) { 
       LOG << "Outlier Phase " << prnGPS.toAscii().data() << ' ' << maxResGPS << endl;
       return prnGPS;
     }
   }
-  else if (iPhase == 0 && maxResGPS > MAXRES_CODE) {
+  else if (iPhase == 0 && maxResGPS > 2.98 * OPT->_maxResC1) {
     LOG << "Outlier Code  " << prnGPS.toAscii().data() << ' ' << maxResGPS << endl;
     return prnGPS;