Changeset 9978 in ntrip for trunk

Timestamp:

Feb 25, 2023, 2:43:10 PM (20 months ago)

Author:

stuerze

Message:

minor changes for test

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -362 +362 @@
             << maxOutlier << endl;
         if (par) {
-          if ( par->ambResetCandidate() || (OPT->_obsModelType == OPT->DCMcodeBias ||    OPT->_obsModelType == OPT->DCMphaseBias) ) {
-            resetAmb(par->prn(), obsVector, &QSav, &xSav);
-          }
-          else {
-            par->setAmbResetCandidate();
-            obs->setOutlier();
-          }
+          resetAmb(par->prn(), obsVector, &QSav, &xSav);
         }
         else {
@@ -461 +455 @@
         // -----------------------
         else {
-          if (refPrn != t_prn()) {
-            return success;
-          }
-          ColumnVector AA(nPar);
-          for (unsigned iPar = 0; iPar < nPar; iPar++) {
-            const t_pppParam *par = params[iPar];
-            AA[iPar] = par->partial(_epoTime, obs, tLC, refPrn);
-          }
-          double ll = obs->obsValue(tLC) - obs->cmpValue(tLC)
-                    - DotProduct(_x0, AA);
-          double vv = DotProduct(AA, _xFlt) - ll;
-          if (fabs(vv) > SLIP) {
-            LOG << epoTimeStr << " cycle slip detected " << t_lc::toString(tLC)
-                << ' ' << obs->prn().toString() << ' ' << setw(8)
-                << setprecision(4) << vv << endl;
-            if (preProcessing) {
+          if (OPT->_obsModelType == OPT->DCMcodeBias || OPT->_obsModelType == OPT->DCMphaseBias) {
+            if (!preProcessing || refPrn != t_prn()) {
+              return success;
+            }
+            ColumnVector AA(nPar);
+            for (unsigned iPar = 0; iPar < nPar; iPar++) {
+              const t_pppParam *par = params[iPar];
+              AA[iPar] = par->partial(_epoTime, obs, tLC, refPrn);
+            }
+            double ll = obs->obsValue(tLC) - obs->cmpValue(tLC) - DotProduct(_x0, AA);
+            double vv = DotProduct(AA, _xFlt) - ll;
+            if (fabs(vv) > SLIP) {
+              LOG << epoTimeStr << " cycle slip detected " << t_lc::toString(tLC)
+                  << ' ' << obs->prn().toString() << ' ' << setw(8)
+                  << setprecision(4) << vv << endl;
               _obsPool->setRefSatChangeRequired(sys, true);
-            } else {
-              resetAmb(obs->prn(), obsVector);
             }
           }