Changeset 9268 in ntrip for trunk

Timestamp:

Nov 23, 2020, 11:24:16 PM (4 years ago)

Author:

stuerze

Message:

minor changes to prevent erroneous epehemeris data sets from usage in combination

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (6 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -194 +194 @@
           this,     SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
 
-
-
   // Combination Method
   // ------------------
@@ -409 +407 @@
       continue;
     }
-    else if (ephLast->checkState() != t_eph::ok) {
-      emit newMessage("bncComb: eph not ok for "  + prn.mid(0,3).toLatin1(), true);
+    else if (ephLast->checkState() == t_eph::bad ||
+             ephLast->checkState() == t_eph::outdated ||
+             ephLast->checkState() == t_eph::unhealthy) {
+      emit newMessage("bncComb: ephLast not ok for "  + prn.mid(0,3).toLatin1(), true);
       delete newCorr;
       continue;
@@ -418 +418 @@
         newCorr->_eph = ephLast;
       }
-      else if (ephPrev && ephPrev->IOD() == newCorr->_iod) {
+      else if (ephPrev && ephPrev->checkState() == t_eph::ok &&
+               ephPrev->IOD() == newCorr->_iod) {
         newCorr->_eph = ephPrev;
         switchToLastEph(ephLast, newCorr);
@@ -434 +435 @@
     QVector<cmbCorr*>& corrs = _buffer[sys][newCorr->_time].corrs;
     corrs.push_back(newCorr);
-
-
   }
 
@@ -709 +708 @@
       ColumnVector xc(6);
       ColumnVector vv(3);
-      eph->getCrd(_resTime, xc, vv, false);
-
+      if (eph->getCrd(_resTime, xc, vv, false) != success) {
+        continue;
+      }
       out << _resTime.datestr().c_str() << " "
           << _resTime.timestr().c_str() << " ";
@@ -762 +762 @@
     corr->_eph->setClkCorr(dynamic_cast<const t_clkCorr*>(&clkCorr));
     corr->_eph->setOrbCorr(dynamic_cast<const t_orbCorr*>(&orbCorr));
-    corr->_eph->getCrd(_resTime, xc, vv, true);
+    if (corr->_eph->getCrd(_resTime, xc, vv, true) != success) {
+      delete corr;
+      continue;
+    }
 
     // Correction Phase Center --> CoM