Changeset 10319 in ntrip

Timestamp:

Jan 26, 2024, 9:37:25 PM (3 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (3 diffs)
• PPP/pppFilter.cpp (modified) (6 diffs)
• PPP/pppParlist.cpp (modified) (2 diffs)
• pppMain.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -376 +376 @@
       double   maxRes      = 0.0;
       int      maxResIndex = -1;
+      unsigned nObs        = 0;
       t_prn    maxResPrn;
-      unsigned nObs = 0;
       for (unsigned ii = 0; ii < obsVector.size(); ii++) {
         const t_pppSatObs* satObs = obsVector.at(ii);
@@ -429 +429 @@
       double   maxRes      = 0.0;
       int      maxResIndex = -1;
+      unsigned nObs        = 0;
       t_prn    maxResPrn;
-      unsigned nObs        = 0;
       for (unsigned ii = 0; ii < obsVector.size(); ii++) {
         const t_pppSatObs* satObs = obsVector.at(ii);
@@ -482 +482 @@
       double   maxRes      = 0.0;
       int      maxResIndex = -1;
+      unsigned nObs        = 0;
       t_prn    maxResPrn;
-      unsigned nObs        = 0;
       for (unsigned ii = 0; ii < obsVector.size(); ii++) {
         const t_pppSatObs* satObs = obsVector.at(ii);

trunk/BNC/src/PPP/pppFilter.cpp

@@ -293 +293 @@
       }
       if (par) {
-//        if (par->ambResetCandidate()) {
-          resetAmb(obs->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
-//        }
-//        else {
-//          par->setAmbResetCandidate();
-//          obs->setOutlier();
-//        }
+        resetAmb(obs->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
       }
       else {
@@ -332 +326 @@
                                     const vector<t_pppSatObs*> &obsVector) {
 
-  const double SLIP = 20.0;
   string epoTimeStr = string(_epoTime);
   const vector<t_pppParam*> &params = _parlist->params();
@@ -348 +341 @@
 
         if (obs->slip()) {
-          LOG << epoTimeStr << "cycle slip set (obs) " << obs->prn().toString() << endl;
+          LOG << epoTimeStr << " Cycle slip set (obs) " << obs->prn().toString() << endl;
           slip = true;
         }
@@ -354 +347 @@
         if (_slips[obs->prn()]._obsSlipCounter != -1 &&
             _slips[obs->prn()]._obsSlipCounter != obs->slipCounter()) {
-          LOG << epoTimeStr  << "cycle slip set (obsSlipCounter) " << obs->prn().toString()  << endl;
+          LOG << epoTimeStr  << " Cycle slip set (obsSlipCounter) " << obs->prn().toString()  << endl;
           slip = true;
         }
@@ -361 +354 @@
         if (_slips[obs->prn()]._biasJumpCounter != -1 &&
             _slips[obs->prn()]._biasJumpCounter != obs->biasJumpCounter()) {
-          LOG << epoTimeStr  << "cycle slip set (biasJumpCounter) " << obs->prn().toString() << endl;
+          LOG << epoTimeStr  << " Cycle slip set (biasJumpCounter) " << obs->prn().toString() << endl;
           slip = true;
         }
@@ -377 +370 @@
 
         else {
+          const double SLIP = 20.0;
           ColumnVector AA(params.size());
           for (unsigned iPar = 0; iPar < params.size(); iPar++) {

trunk/BNC/src/PPP/pppParlist.cpp

@@ -45 +45 @@
   _noise    = 0.0;
   _ambInfo  = 0;
+  double fac = 1.0;
 
   switch (_type) {
@@ -67 +68 @@
      break;
    case amb:
+     if (tLC == t_lc::lIF) {fac = 3.0;}
      _epoSpec = false;
-     _sigma0  = OPT->_aprSigAmb;
+     _sigma0  = fac * OPT->_aprSigAmb;
      _ambInfo = new t_ambInfo();
      if (obsVector) {

trunk/BNC/src/pppMain.cpp

@@ -526 +526 @@
     // Some default values
     // -------------------
+    opt->_aprSigClk       = 300000.0;
+    opt->_aprSigClkOff    = 100.0;
     opt->_aprSigAmb       = 10000.0;
-    opt->_aprSigClk       = 300000.0;
-    opt->_aprSigClkOff    = 300000.0;
-    opt->_aprSigIon       = 10000.0;
-    opt->_noiseIon        = 10000.0;
+    opt->_aprSigIon       = 10000000.0;
+    opt->_noiseIon        = 10000000.0;
     opt->_aprSigCodeBias  = 10000.0;
     opt->_noiseCodeBias   = 10000.0;