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

Timestamp:

Mar 16, 2023, 5:25:56 PM (13 months ago)

Author:

stuerze

Message:

minor changes

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -342 +342 @@
       for (unsigned iPar = 0; iPar < nPar; iPar++) {
         t_pppParam *hlp = params[iPar];
-        if (hlp->type() == t_pppParam::amb && hlp->prn() == obs->prn()
-            && hlp->tLC() == usedTypes[maxOutlierIndex]) {
+        if (hlp->type() == t_pppParam::amb &&
+            hlp->prn() == obs->prn() &&
+            hlp->tLC() == usedTypes[maxOutlierIndex]) {
           par = hlp;
         }
@@ -355 +356 @@
               << ' ' << setw(8) << setprecision(4) << maxOutlier << endl;
           break;
-        } //else {obs->setOutlier(); }
+        } //else {obs->setOutlier();}
       } else {    // fin-processing
         LOG << epoTimeStr << " Outlier " << t_lc::toString(maxOutlierLC) << ' '
@@ -364 +365 @@
               OPT->_obsModelType == OPT->DCMcodeBias ||
               OPT->_obsModelType == OPT->DCMphaseBias) {
-            resetAmb(par->prn(), obsVector, &QSav, &xSav);
+            resetAmb(par->prn(), obsVector, maxOutlierLC, &QSav, &xSav);
           }
           else {
@@ -456 +457 @@
             _obsPool->setRefSatChangeRequired(sys, true);
           } else {
-            resetAmb(obs->prn(), obsVector);
+            resetAmb(obs->prn(), obsVector, tLC);
           }
         }
@@ -477 +478 @@
               _obsPool->setRefSatChangeRequired(sys, true);
             } else {
-              resetAmb(obs->prn(), obsVector);
+              resetAmb(obs->prn(), obsVector, tLC);
             }
           }
@@ -490 +491 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc t_pppFilter::resetAmb(t_prn prn, const vector<t_pppSatObs*> &obsVector,
-    SymmetricMatrix *QSav, ColumnVector *xSav) {
+    t_lc::type lc, SymmetricMatrix *QSav, ColumnVector *xSav) {
 
   t_irc irc = failure;
@@ -499 +500 @@
       int ind = par->indexNew();
       t_lc::type tLC = par->tLC();
+      if (tLC != lc) {continue;}
       LOG << string(_epoTime) << " RESET " << par->toString() << endl;
       delete par;
@@ -688 +690 @@
   // reset old and set new refSats in last epoch (ambiguities/GIM)
   // =============================================================
-  if (resetRefSatellitesLastEpoch(allObs, refSatMap, refSatMapLastEpoch)
-      != true) {
-    LOG << "datumTransformation: resetRefSatellitesLastEpoch != success"
-        << endl;
+  if (resetRefSatellitesLastEpoch(allObs, refSatMap, refSatMapLastEpoch) != true) {
+    LOG << "datumTransformation: resetRefSatellitesLastEpoch != success"  << endl;
     return failure;
   }
@@ -767 +767 @@
     LOG << "AA.SubMatrix(1 .. " << iObs+1 << " , 1 .. " <<  nPar << ")" << endl;
 #endif
-    if (_datumTrafo->prepareAA(AA.SubMatrix(1, iObs + 1, 1, nPar), 2)
-        != success) {
+    if (_datumTrafo->prepareAA(AA.SubMatrix(1, iObs + 1, 1, nPar), 2)  != success) {
       return failure;
     }
@@ -776 +775 @@
   // Datum Transformation
   // ====================
-#ifdef BNC_DEBUG_PPP
-  //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
-  //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
-#endif
   if (_datumTrafo->computeTrafoMatrix() != success) {
     return failure;
   }
-#ifdef BNC_DEBUG_PPP
-  //LOG << "D21" << endl; _datumTrafo->printMatrix(_datumTrafo->D21(), _datumTrafo->numObs(), _datumTrafo->numPar());
-#endif
+
   ColumnVector xFltOld = _xFlt;
   SymmetricMatrix QFltOld = _QFlt;
@@ -801 +794 @@
   for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
     char sys = usedSystems[iSys];
+    vector<t_lc::type> LCs = OPT->LCs(sys);
+    unsigned usedLCs = LCs.size();
+    if (OPT->_pseudoObsIono && !pseudoObsIono) {
+      usedLCs -= 1;  // GIM not used
+    }
     t_prn refPrnOld = refSatMapLastEpoch[sys]->prn();
     t_prn refPrnNew = refSatMap[sys]->prn();
     if (refPrnNew != refPrnOld) {
-      resetAmb(refPrnOld, allObs);/*
-      if (resetAmb(refPrnOld, allObs) == success) {
-        if (OPT->_obsModelType == OPT->DCMcodeBias) {
-          addNoiseToPar(t_pppParam::ion, sys);
-        } else if (OPT->_obsModelType == OPT->DCMphaseBias) {
-          if        (sys == 'G') {
-            addNoiseToPar(t_pppParam::pBiasG1, sys);
-            addNoiseToPar(t_pppParam::pBiasG2, sys);
-          } else if (sys == 'R') {
-            addNoiseToPar(t_pppParam::pBiasR1, sys);
-            addNoiseToPar(t_pppParam::pBiasR2, sys);
-          } else if (sys == 'E') {
-            addNoiseToPar(t_pppParam::pBiasE1, sys);
-            addNoiseToPar(t_pppParam::pBiasE2, sys);
-          } else if (sys == 'C') {
-            addNoiseToPar(t_pppParam::pBiasC1, sys);
-            addNoiseToPar(t_pppParam::pBiasC2, sys);
-          }
-        }
-      }*/
+      for (unsigned jj = 0; jj < usedLCs; jj++) {
+        const t_lc::type tLC = LCs[jj];
+        if (tLC == t_lc::GIM) {
+          continue;
+        }
+        resetAmb(refPrnOld, allObs, tLC);
+      }
     }
   }