Changeset 9635 in ntrip for trunk/BNC/src/combination/bnccomb.cpp

Timestamp:

Feb 24, 2022, 5:08:42 PM (2 years ago)

Author:

stuerze

Message:

consideration of incoming Code Biases during clock combination

File:

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

trunk/BNC/src/combination/bnccomb.cpp

@@ -18 +18 @@
 #include <iomanip>
 #include <sstream>
+#include <map>
 
 #include "bnccomb.h"
@@ -472 +473 @@
     }
 
-    // Check satellite code biases
-    // ----------------------------
-    if (!_satCodeBiases.contains(acName)) {
-      delete newCorr;
-      continue;
-    }
-    else {
-      QMap<t_prn, t_satCodeBias>& storage = _satCodeBiases[acName];
-      if (!storage.contains(clkCorr._prn)) {
-        delete newCorr;
-        continue;
-      }
-      else {
-        newCorr->_satCodeBias = storage[clkCorr._prn];
-      }
-    }
-
     // Check the Ephemeris
     //--------------------
@@ -520 +504 @@
         continue;
       }
+    }
+
+    // Check satellite code biases
+    // ----------------------------
+    if (!_satCodeBiases.contains(acName)) {
+      delete newCorr;
+      continue;
+    }
+    else {
+      QMap<t_prn, t_satCodeBias>& storage = _satCodeBiases[acName];
+      if (!storage.contains(clkCorr._prn)) {
+        delete newCorr;
+        continue;
+      }
+      else {
+        t_satCodeBias& satCodeBias = storage[clkCorr._prn];
+        QMap<t_frequency::type, double> codeBias;
+        for (unsigned ii = 1; ii < t_lcRefSig::cIF; ii++) {
+          t_frequency::type frqType = t_lcRefSig::toFreq(sys,  static_cast<t_lcRefSig::type>(ii));
+          char frqNum = t_frequency::toString(frqType)[1];
+          char attrib = t_lcRefSig::toAttrib(sys,  static_cast<t_lcRefSig::type>(ii));
+          QString obsType = QString("%1%2").arg(frqNum).arg(attrib);
+          for (unsigned ii = 0; ii < satCodeBias._bias.size(); ii++) {
+            const t_frqCodeBias& bias = satCodeBias._bias[ii];
+            if (obsType.toStdString() == bias._rnxType2ch) {
+              codeBias[frqType] = bias._value;
+            }
+          }
+        }
+        map<t_frequency::type, double> codeCoeff;
+        double channel = double(newCorr->_eph->slotNum());
+        t_lcRefSig::coeff(sys, t_lcRefSig::cIF, channel, codeCoeff);
+        map<t_frequency::type, double>::const_iterator it;
+        for (it = codeCoeff.begin(); it != codeCoeff.end(); it++) {
+          t_frequency::type frqType = it->first;
+          newCorr->_codeBiasIF += it->second * codeBias[frqType];
+        }
+      }
+      cout <<  acName.toStdString() << " " << clkCorr._prn.toString().c_str() << " _codeBiasIF: " << newCorr->_codeBiasIF << endl;
     }
 
@@ -597 +620 @@
   QTextStream out(&_log, QIODevice::WriteOnly);
 
-  out << endl <<           "Combination: " << sys << endl
-      << "--------------------------------" << endl;
+  out << "\n" <<           "Combination: " << sys << "\n"
+      << "--------------------------------" << "\n";
 
   // Observation Statistics
@@ -617 +640 @@
       }
     }
-    out << AC->name.toLatin1().data() << ": " << AC->numObs[sys] << endl;
+    out << AC->name.toLatin1().data() << ": " << AC->numObs[sys] << "\n";
   }
 
@@ -629 +652 @@
     ++_masterMissingEpochs[sys];
     if (_masterMissingEpochs[sys] < switchMasterAfterGap) {
-      out << "Missing Master, Epoch skipped" << endl;
+      out << "Missing Master, Epoch skipped" << "\n";
       _buffer[sys].remove(_resTime);
       emit newMessage(_log, false);
@@ -644 +667 @@
               << AC->name.toLatin1().data()   << " "
               << _resTime.datestr().c_str()    << " "
-              << _resTime.timestr().c_str()    << endl;
+              << _resTime.timestr().c_str()    << "\n";
           _masterOrbitAC[sys] = AC->name;
           break;
@@ -682 +705 @@
       out.setRealNumberPrecision(4);
       out << pp->toString(sys) << " "
-          << pp->xx << " +- " << sqrt(_QQ[sys](pp->index,pp->index)) << endl;
+          << pp->xx << " +- " << sqrt(_QQ[sys](pp->index,pp->index)) << "\n";
       out.setFieldWidth(0);
     }
@@ -762 +785 @@
       }
 
-      out << "  Outlier" << endl;
+      out << "  Outlier" << "\n";
       _QQ[sys] = QQ_sav;
       corrs(sys).remove(maxResIndex-1);
     }
     else {
-      out << "  OK" << endl;
+      out << "  OK" << "\n";
       out.setRealNumberNotation(QTextStream::FixedNotation);
       out.setRealNumberPrecision(4);
@@ -776 +799 @@
             << corr->_acName << ' ' << corr->_prn.mid(0,3);
         out.setFieldWidth(10);
-        out <<  " res = " << vv[ii] << endl;
+        out <<  " res = " << vv[ii] << "\n";
         out.setFieldWidth(0);
       }
@@ -807 +830 @@
       out << "Full Clock " << corr->_prn.mid(0,3) << " " << corr->_iod << " ";
       out.setFieldWidth(14);
-      out << (xc(4) + corr->_dClkResult) * t_CST::c << endl;
+      out << (xc(4) + corr->_dClkResult) * t_CST::c << "\n";
       out.setFieldWidth(0);
     }
     else {
-      out << "bncComb::printResuls bug" << endl;
+      out << "bncComb::printResuls bug" << "\n";
     }
   }
@@ -958 +981 @@
     }
 
-    ll(iObs) = corr->_clkCorr._dClk * t_CST::c - DotProduct(AA.Row(iObs), x0);
+    ll(iObs) = (corr->_clkCorr._dClk * t_CST::c - corr->_codeBiasIF) - DotProduct(AA.Row(iObs), x0);
   }
 
@@ -1117 +1140 @@
     }
     catch (Exception& exc) {
-      out << exc.what() << endl;
+      out << exc.what() << "\n";
       return failure;
     }
@@ -1130 +1153 @@
 
     if (maxRes > _MAXRES) {
-      out << "  Outlier" << endl;
+      out << "  Outlier" << "\n";
       delete corrs(sys)[maxResIndex-1];
       corrs(sys).remove(maxResIndex-1);
     }
     else {
-      out << "  OK" << endl;
+      out << "  OK" << "\n";
       out.setRealNumberNotation(QTextStream::FixedNotation);
       out.setRealNumberPrecision(3);
@@ -1144 +1167 @@
             << corr->_acName << ' ' << corr->_prn.mid(0,3);
         out.setFieldWidth(6);
-        out << " res = " << vv[ii] << endl;
+        out << " res = " << vv[ii] << "\n";
         out.setFieldWidth(0);
       }
@@ -1172 +1195 @@
 
     if      (ephLast == 0) {
-      out << "checkOrbit: missing eph (not found) " << corr->_prn.mid(0,3) << endl;
+      out << "checkOrbit: missing eph (not found) " << corr->_prn.mid(0,3) << "\n";
       delete corr;
       im.remove();
     }
     else if (corr->_eph == 0) {
-      out << "checkOrbit: missing eph (zero) " << corr->_prn.mid(0,3) << endl;
+      out << "checkOrbit: missing eph (zero) " << corr->_prn.mid(0,3) << "\n";
       delete corr;
       im.remove();
@@ -1186 +1209 @@
       }
       else {
-        out << "checkOrbit: missing eph (deleted) " << corr->_prn.mid(0,3) << endl;
+        out << "checkOrbit: missing eph (deleted) " << corr->_prn.mid(0,3) << "\n";
         delete corr;
         im.remove();
@@ -1268 +1291 @@
               << prn.mid(0,3).toLatin1().data()           << " "
               << corr->_iod                     << " "
-              << norm                           << endl;
+              << norm                           << "\n";
           delete corr;
           im.remove();
@@ -1301 +1324 @@
       out << "Provider ID changed: AC " << AC->name.toLatin1().data()   << " "
           << _resTime.datestr().c_str()    << " "
-          << _resTime.timestr().c_str()    << endl;
+          << _resTime.timestr().c_str()    << "\n";
       break;
     }