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

Timestamp:

Jun 29, 2020, 10:09:16 AM (4 years ago)

Author:

stuerze

Message:

PPP update: pseudo obs tropo added

File:

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

trunk/BNC/src/PPP/pppFilter.cpp

@@ -117 +117 @@
   // Init Datum Trafo
   // ----------------------------------------
-  if ((OPT->_obsModelType == OPT->DCMcodeBias ||
-       OPT->_obsModelType == OPT->DCMphaseBias) &&
-      (_numEpoProcessing == 1)) {
+  if ((OPT->_obsModelType == OPT->DCMcodeBias   ||
+       OPT->_obsModelType == OPT->DCMphaseBias) && (_numEpoProcessing == 1)) {
     _numAllUsedLCs = 0;
     for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
       char system = OPT->systems()[iSys];
       _numAllUsedLCs += OPT->LCs(system).size();
-      if (OPT->_pseudoObsIono && !epoch->pseudoObsIono()) {
+      if (OPT->_pseudoObsIono && epoch->pseudoObsIono() == false) {
         _numAllUsedLCs -= 1;  // GIM not used
       }
     }
-    int maxObs = allObs.size() * _numAllUsedLCs;
+    int modify = 0;
+    if (OPT->_pseudoObsTropo) {
+      modify  = -1;
+    }
+    // max Obs
+    int maxObs = allObs.size() * (_numAllUsedLCs + modify);
+    if (OPT->_pseudoObsIono && epoch->pseudoObsIono() == true) { // stecDiff w.r.t refSat
+      maxObs -= 1;
+    }
+    if (OPT->_pseudoObsTropo) {
+      maxObs += 1;  // once per station
+    }
     _datumTrafo->initAA(maxObs, _parlist->nPar());
   }
@@ -144 +154 @@
         _refPrn = (_obsPool->getRefSatMapElement(system))->prn();
         if (_obsPool->hasHistoricalRefSat(_refPrn)) {
+          LOG << epoTimeStr << " Warning: prevent to process erroneous refSat again!";
           return failure;
         }
@@ -219 +230 @@
   }
 
-  unsigned usedLCs = LCs.size(); //qDebug() << "usedLCs: " << usedLCs;
+  unsigned usedLCs = LCs.size();
   if (OPT->_pseudoObsIono && !pseudoObsIonoAvailable) {
     usedLCs -= 1;  // GIM not used
   }
+
   ColumnVector               xSav       = _xFlt;
   SymmetricMatrix            QSav       = _QFlt;
   string                     epoTimeStr = string(_epoTime);
   const vector<t_pppParam*>& params     = _parlist->params();
-  unsigned                   maxObs     = obsVector.size() * usedLCs;
-  //unsigned                   maxObs     = 2 * usedLCs;
-
+  int modify = 0;
+  if (OPT->_pseudoObsTropo) {
+    modify  = -1;
+  }
+  // max Obs
+  unsigned maxObs = obsVector.size() * (usedLCs + modify);
   if (OPT->_pseudoObsIono && pseudoObsIonoAvailable) { // stecDiff w.r.t refSat
     maxObs -= 1;
+  }
+  if (OPT->_pseudoObsTropo) {
+    maxObs +=1;   // tropo pseudo obs once per station
   }
 
@@ -257 +275 @@
         for (unsigned jj = 0; jj < usedLCs; jj++) {
           const t_lc::type tLC = LCs[jj];
-          if (tLC == t_lc::GIM &&  obs->isReference()) {continue;}
+          if (tLC == t_lc::GIM && obs->isReference()) {continue;}
+          if (tLC == t_lc::Tz0 && ii+1 != obsVector.size()) {continue;}
           ++iObs;
           usedObs.push_back(obs);
@@ -417 +436 @@
           _slips[obs->prn()]._obsSlipCounter = obs->slipCounter();
         }
-
         if (_slips[obs->prn()]._biasJumpCounter != -1 &&
             _slips[obs->prn()]._biasJumpCounter != obs->biasJumpCounter()) {
@@ -468 +486 @@
 t_irc t_pppFilter::resetAmb(t_prn prn, const vector<t_pppSatObs*>& obsVector,
                             SymmetricMatrix* QSav, ColumnVector* xSav) {
-
+                            
   t_irc irc = failure;
   vector<t_pppParam*>& params = _parlist->params();
@@ -587 +605 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_pppFilter::datumTransformation(const ColumnVector& xFltOld, const SymmetricMatrix& QFltOld) {
-
   Matrix D21 = _datumTrafo->computeTrafoMatrix();
   _QFlt << D21 * QFltOld * D21.t();