Changeset 10250 in ntrip for trunk

Timestamp:

Nov 13, 2023, 1:44:42 PM (6 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• PPP/pppFilter.cpp (modified) (4 diffs)
• pppMain.cpp (modified) (2 diffs)
• pppWidgets.cpp (modified) (6 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -267 +267 @@
       }
       if (par) {
-        //if (par->ambResetCandidate()) {
+        if (par->ambResetCandidate()) {
           resetAmb(obs->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
-        //}
-        //else {
-        //  par->setAmbResetCandidate();
-        //  obs->setOutlier();
-        //}
+          adjustNoise(t_pppParam::ion, obs->prn(), 0.1, &QSav);
+        }
+        else {
+          par->setAmbResetCandidate();
+          obs->setOutlier();
+        }
       }
       else {
@@ -343 +344 @@
         if (slip) {
           resetAmb(obs->prn(), obsVector, tLC);
+          adjustNoise(t_pppParam::ion, obs->prn(), 0.1);
         }
 
@@ -361 +363 @@
                 << obs->prn().toString() << ' ' << setw(8) << setprecision(4) << vv << endl;
             resetAmb(obs->prn(), obsVector, tLC);
+            adjustNoise(t_pppParam::ion, obs->prn(), 0.1);
           }
         }
@@ -398 +401 @@
         _QFlt(ii, ind + 1) = 0.0;
         if (QSav) {
-          (*QSav)(ii, ind + 1) = 0.0; 
+          (*QSav)(ii, ind + 1) = 0.0;
         }
       }

trunk/BNC/src/pppMain.cpp

@@ -182 +182 @@
     opt->_blqFileName.assign(settings.value("PPP/blqFile").toString().toStdString());
 #endif
-    opt->_sigmaC1      = settings.value("PPP/sigmaC1").toDouble(); if (opt->_sigmaC1 <= 0.0)  opt->_sigmaC1  = 2.00;
-    opt->_sigmaL1      = settings.value("PPP/sigmaL1").toDouble(); if (opt->_sigmaL1 <= 0.0)  opt->_sigmaL1  = 0.02;
-    opt->_sigmaGIM     = settings.value("PPP/sigmaGIM").toDouble();if (opt->_sigmaGIM <= 0.0) opt->_sigmaGIM = 2.00;
+    opt->_sigmaC1      = settings.value("PPP/sigmaC1").toDouble(); if (opt->_sigmaC1 <= 0.0)  opt->_sigmaC1  = 1.00;
+    opt->_sigmaL1      = settings.value("PPP/sigmaL1").toDouble(); if (opt->_sigmaL1 <= 0.0)  opt->_sigmaL1  = 0.01;
+    opt->_sigmaGIM     = settings.value("PPP/sigmaGIM").toDouble();if (opt->_sigmaGIM <= 0.0) opt->_sigmaGIM = 1.00;
     opt->_corrWaitTime = settings.value("PPP/corrWaitTime").toDouble();
     if (!_realTime || opt->_corrMount.empty()) {
@@ -400 +400 @@
     opt->_minObs      = settings.value("PPP/minObs").toInt(); if (opt->_minObs < 4) opt->_minObs = 4;
     opt->_minEle      = settings.value("PPP/minEle").toDouble() * M_PI / 180.0;
-    opt->_maxResC1    = settings.value("PPP/maxResC1").toDouble();  if (opt->_maxResC1 <= 0.0)  opt->_maxResC1  = 3.0;
-    opt->_maxResL1    = settings.value("PPP/maxResL1").toDouble();  if (opt->_maxResL1 <= 0.0)  opt->_maxResL1  = 0.05;
-    opt->_maxResGIM   = settings.value("PPP/maxResGIM").toDouble(); if (opt->_maxResGIM <= 0.0) opt->_maxResGIM = 3.0;
+    opt->_maxResC1    = settings.value("PPP/maxResC1").toDouble();  if (opt->_maxResC1 <= 0.0)  opt->_maxResC1  = 2.0;
+    opt->_maxResL1    = settings.value("PPP/maxResL1").toDouble();  if (opt->_maxResL1 <= 0.0)  opt->_maxResL1  = 0.02;
+    opt->_maxResGIM   = settings.value("PPP/maxResGIM").toDouble(); if (opt->_maxResGIM <= 0.0) opt->_maxResGIM = 2.0;
     opt->_eleWgtCode  = (settings.value("PPP/eleWgtCode").toInt() != 0);
     opt->_eleWgtPhase = (settings.value("PPP/eleWgtPhase").toInt() != 0);

trunk/BNC/src/pppWidgets.cpp

@@ -353 +353 @@
   }
   else {
-    _sigmaC1->setText("2.0");
+    _sigmaC1->setText("1.0");
   }
 
@@ -360 +360 @@
   }
   else {
-    _sigmaL1->setText("0.02");
+    _sigmaL1->setText("0.01");
   }
 
@@ -367 +367 @@
   }
   else {
-    _sigmaGIM->setText("5.0");
+    _sigmaGIM->setText("1.0");
   }
 
@@ -374 +374 @@
   }
   else {
-    _maxResC1->setText("3.0");
+    _maxResC1->setText("2.0");
   }
 
@@ -381 +381 @@
   }
   else {
-    _maxResL1->setText("0.03");
+    _maxResL1->setText("0.02");
   }
 
@@ -388 +388 @@
   }
   else {
-    _maxResGIM->setText("3.0");
+    _maxResGIM->setText("2.0");
   }