Changeset 10002 in ntrip for trunk/BNC/src/PPP/pppFilter.cpp

Timestamp:

Mar 15, 2023, 5:37:02 PM (14 months ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/PPP/pppFilter.cpp (modified) (7 diffs)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -348 +348 @@
       }
       if (preProcessing) {
-        // for refSats no ambiguity parameter exists
-        if ((obs->prn() == refPrn)
-            && (t_lc::toString(maxOutlierLC) == "l1" ||
-                t_lc::toString(maxOutlierLC) == "l2")) {
+        if (obs->prn() == refPrn) {
           _obsPool->setRefSatChangeRequired(sys, true);
           LOG << epoTimeStr << " Outlier ("
@@ -357 +354 @@
               << t_lc::toString(maxOutlierLC) << ' ' << obs->prn().toString()
               << ' ' << setw(8) << setprecision(4) << maxOutlier << endl;
-          break;
-        } else {
-          obs->setOutlier();
-        }
+          //break;
+        } //else {obs->setOutlier(); }
       } else {    // fin-processing
         LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' '
@@ -366 +361 @@
             << maxOutlier << endl;
         if (par) {
-          //if ( par->ambResetCandidate() || (OPT->_obsModelType == OPT->DCMcodeBias ||    OPT->_obsModelType == OPT->DCMphaseBias) ) {
+          if (par->ambResetCandidate() ||
+              OPT->_obsModelType == OPT->DCMcodeBias ||
+              OPT->_obsModelType == OPT->DCMphaseBias) {
             resetAmb(par->prn(), obsVector, &QSav, &xSav);
-          //}
-          //else {
-          //  par->setAmbResetCandidate();
-          //  obs->setOutlier();
-          //}
+          }
+          else {
+            par->setAmbResetCandidate();
+            obs->setOutlier();
+          }
         }
         else {
@@ -408 +405 @@
     const vector<t_pppSatObs*> &obsVector, const t_prn &refPrn,
     bool preProcessing) {
-  const double SLIP = 100.0;
+  const double SLIP = 20.0;
   char sys = refPrn.system();
   string epoTimeStr = string(_epoTime);
@@ -462 +459 @@
           }
         }
-        /* Check Pre-Fit Residuals
+        // Check Pre-Fit Residuals
         // -----------------------
         else {
-          if (refPrn != t_prn()) {
-            return success;
-          }
           ColumnVector AA(nPar);
           for (unsigned iPar = 0; iPar < nPar; iPar++) {
@@ -486 +480 @@
             }
           }
-        }*/
+        }
       }
     }
@@ -768 +762 @@
       continue;
     }
-    _datumTrafo->updateIndices(sys, iObs + 1); //LOG << "AA Ncols/Nrows: " << AA.Ncols() << "/" << AA.Nrows() << "  nPar: "  << nPar << endl;    //LOG << "AA.SubMatrix(1 .. " << iObs+1 << " , 1 .. " <<  nPar << ")" << endl;
+    _datumTrafo->updateIndices(sys, iObs + 1);
+#ifdef BNC_DEBUG_PPP
+    LOG << "AA Ncols/Nrows: " << AA.Ncols() << "/" << AA.Nrows() << "  nPar: "  << nPar << endl;
+    LOG << "AA.SubMatrix(1 .. " << iObs+1 << " , 1 .. " <<  nPar << ")" << endl;
+#endif
     if (_datumTrafo->prepareAA(AA.SubMatrix(1, iObs + 1, 1, nPar), 2)
         != success) {