Changeset 9267 in ntrip for branches/BNC_2.12

Timestamp:

Nov 23, 2020, 9:40:46 PM (3 years ago)

Author:

stuerze

Message:

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

File:

• branches/BNC_2.12/src/combination/bnccomb.cpp (modified) (6 diffs)

branches/BNC_2.12/src/combination/bnccomb.cpp

@@ -163 +163 @@
 
   QString ssrFormat;
+  _ssrCorr = 0;
   QListIterator<QString> it(settings.value("uploadMountpointsOut").toStringList());
   while (it.hasNext()) {
@@ -170 +171 @@
     }
   }
-  _ssrCorr = 0;
   if      (ssrFormat == "IGS-SSR") {
     _ssrCorr = new SsrCorrIgs();
@@ -177 +177 @@
     _ssrCorr = new SsrCorrRtcm();
   }
-
+  else { // default
+    _ssrCorr = new SsrCorrIgs();
+  }
+  
   _rtnetDecoder = 0;
 
@@ -407 +410 @@
     else {
       QMap<t_prn, t_orbCorr>& storage = _orbCorrections[acName];
-      if (!storage.contains(clkCorr._prn)  || storage[clkCorr._prn]._iod != newCorr->_iod) {
+      if (!storage.contains(clkCorr._prn)  || 
+           storage[clkCorr._prn]._iod != newCorr->_iod) {
         delete newCorr;
         continue;
@@ -422 +426 @@
     if (ephLast == 0) {
       emit newMessage("bncComb: eph not found for "  + prn.mid(0,3).toAscii(), true);
+      delete newCorr;
+      continue;
+    }
+    else if (ephLast->checkState() != t_eph::ok) {
+      emit newMessage("bncComb: eph not ok for "  + prn.mid(0,3).toLatin1(), true);
       delete newCorr;
       continue;
@@ -470 +479 @@
   ColumnVector oldXC(6);
   ColumnVector oldVV(3);
-  corr->_eph->getCrd(corr->_time, oldXC, oldVV, false);
+  if (corr->_eph->getCrd(corr->_time, oldXC, oldVV, false) != success) {
+    return;
+  }
 
   ColumnVector newXC(6);
   ColumnVector newVV(3);
-  lastEph->getCrd(corr->_time, newXC, newVV, false);
+  if (lastEph->getCrd(corr->_time, newXC, newVV, false) != success) {
+    return;
+  }
 
   ColumnVector dX = newXC.Rows(1,3) - oldXC.Rows(1,3);
   ColumnVector dV = newVV           - oldVV;
   double       dC = newXC(4)        - oldXC(4);
-
-  // small check
-  // -----------
-  const double MAXDIFF = 1000.0;
-  double diff  = dX.norm_Frobenius();
-  double diffC = dC * t_CST::c ;
-  if (diff  > MAXDIFF ||
-      diffC > MAXDIFF) {
-    return;
-  }
 
   ColumnVector dRAO(3);