Changeset 10193 in ntrip for trunk/BNC/src

Timestamp:

Sep 1, 2023, 10:40:53 PM (15 months ago)

Author:

stuerze

Message:

changes regarding ppp

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (10 diffs)
• pppFilter.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -69 +69 @@
   _offGal = 0.0;
   _offBds = 0.0;
+
   CLIENTS.setLocalData(this);  // CLIENTS takes ownership over "this"
 }
@@ -340 +341 @@
 double t_pppClient::cmpOffGlo(vector<t_pppSatObs*>& obsVector) {
 
-  t_lc::type tLC   = t_lc::dummy;
-  double     offGlo = 0.0;
-
+  t_lc::type tLC = t_lc::dummy;
+  double offGlo = 0.0;
+  double MAXRES = 0.0;
   if (OPT->useSystem('R')) {
 
@@ -356 +357 @@
           if (tLC == t_lc::dummy) {
             tLC = satObs->isValid(t_lc::cIF) ? t_lc::cIF : t_lc::c1;
+            MAXRES = satObs->maxRes(tLC);
           }
           if (satObs->isValid(tLC) && (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle)) {
@@ -377 +379 @@
       }
 
-      if (fabs(maxRes) > 1000.0) {
+      if (fabs(maxRes) > MAXRES) {
         LOG << "t_pppClient::cmpOffGlo outlier " << maxResPrn.toString() << " " << maxRes << endl;
         obsVector.erase(obsVector.begin() + maxResIndex);
@@ -394 +396 @@
 double t_pppClient::cmpOffGal(vector<t_pppSatObs*>& obsVector) {
 
-  t_lc::type tLC   = t_lc::dummy;
-  double     offGal = 0.0;
+  t_lc::type tLC  = t_lc::dummy;
+  double offGal = 0.0;
+  double MAXRES = 0.0;
 
   if (OPT->useSystem('E')) {
@@ -410 +413 @@
           if (tLC == t_lc::dummy) {
             tLC = satObs->isValid(t_lc::cIF) ? t_lc::cIF : t_lc::c1;
+            MAXRES = satObs->maxRes(tLC);
           }
           if (satObs->isValid(tLC) && (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle)) {
@@ -431 +435 @@
       }
 
-      if (fabs(maxRes) > 1000.0) {
+      if (fabs(maxRes) > MAXRES) {
         LOG << "t_pppClient::cmpOffGal outlier " << maxResPrn.toString() << " " << maxRes << endl;
         obsVector.erase(obsVector.begin() + maxResIndex);
@@ -449 +453 @@
 double t_pppClient::cmpOffBds(vector<t_pppSatObs*>& obsVector) {
 
-  t_lc::type tLC   = t_lc::dummy;
-  double     offBds = 0.0;
+  t_lc::type tLC = t_lc::dummy;
+  double offBds = 0.0;
+  double MAXRES = 0.0;
 
   if (_opt->useSystem('C')) {
@@ -464 +469 @@
           if (tLC == t_lc::dummy) {
             tLC = satObs->isValid(t_lc::cIF) ? t_lc::cIF : t_lc::c1;
+            MAXRES = satObs->maxRes(tLC);
           }
           if (satObs->isValid(tLC) && (!satObs->modelSet() || satObs->eleSat() >= _opt->_minEle)) {
@@ -485 +491 @@
       }
 
-      if (fabs(maxRes) >  1000.0) {
+      if (fabs(maxRes) > MAXRES) {
         LOG << "t_pppClient::cmpOffBds outlier " << maxResPrn.toString() << " " << maxRes << endl;
         delete obsVector.at(maxResIndex);

trunk/BNC/src/PPP/pppFilter.cpp

@@ -192 +192 @@
     // Check number of observations
     // ----------------------------
-    if (nSat < 2) {
+    if (nSat < 3) {
       LOG << "t_pppFilter::processSystem not enough observations " << nSat << "\n";
       return failure;