Changeset 7029 in ntrip for trunk

Timestamp:

Jul 10, 2015, 11:10:31 AM (9 years ago)

Author:

stuerze

Message:

code bias usage is added for PPP SSR_I mode

Location:

trunk/BNC/src/PPP_SSR_I

Files:

• pppClient.cpp (modified) (7 diffs)
• pppClient.h (modified) (2 diffs)

trunk/BNC/src/PPP_SSR_I/pppClient.cpp

@@ -59 +59 @@
   _log     = new ostringstream();
   _ephUser = new bncEphUser(false);
+
+  for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
+    _satCodeBiases[ii] = 0;
+  }
+
 }
 
@@ -64 +69 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppClient::~t_pppClient() {
+
+  for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
+    delete _satCodeBiases[ii];
+  }
+
   delete _filter;
   delete _epoData;
@@ -80 +90 @@
   for (unsigned ii = 0; ii < satObs.size(); ii++) {
     const t_satObs* obs     = satObs[ii]; 
-    t_satData*      satData = new t_satData();
+    t_prn prn = obs->_prn;
+    t_satData*   satData = new t_satData();
 
     if (_epoData->tt.undef()) {
@@ -87 +98 @@
 
     satData->tt       = obs->_time;
-    satData->prn      = QString(obs->_prn.toInternalString().c_str());
+    satData->prn      = QString(prn.toInternalString().c_str());
     satData->slipFlag = false;
     satData->P1       = 0.0;
@@ -99 +110 @@
     for (unsigned ifrq = 0; ifrq < obs->_obs.size(); ifrq++) {
       t_frqObs* frqObs = obs->_obs[ifrq];
+      double cb = 0.0;
+      const t_satCodeBias* satCB = satCodeBias(prn);
+      if (satCB && satCB->_bias.size()) {
+        for (unsigned ii = 0; ii < satCB->_bias.size(); ii++) {
+          const t_frqCodeBias& bias = satCB->_bias[ii];
+          if (frqObs && frqObs->_rnxType2ch == bias._rnxType2ch) {
+            cb  = bias._value;
+          }
+        }
+      }
       if      (frqObs->_rnxType2ch[0] == '1') {
-        if (frqObs->_codeValid)  satData->P1       = frqObs->_code;
+        if (frqObs->_codeValid)  satData->P1       = frqObs->_code + cb;
         if (frqObs->_phaseValid) satData->L1       = frqObs->_phase;
         if (frqObs->_slip)       satData->slipFlag = true;
       }
       else if (frqObs->_rnxType2ch[0] == '2') {
-        if (frqObs->_codeValid)  satData->P2       = frqObs->_code;
+        if (frqObs->_codeValid)  satData->P2       = frqObs->_code + cb;
         if (frqObs->_phaseValid) satData->L2       = frqObs->_phase;
         if (frqObs->_slip)       satData->slipFlag = true;
       }
       else if (frqObs->_rnxType2ch[0] == '5') {
-        if (frqObs->_codeValid)  satData->P5       = frqObs->_code;
+        if (frqObs->_codeValid)  satData->P5       = frqObs->_code + cb;
         if (frqObs->_phaseValid) satData->L5       = frqObs->_phase;
         if (frqObs->_slip)       satData->slipFlag = true;
       }
       else if (frqObs->_rnxType2ch[0] == '7') {
-              if (frqObs->_codeValid)  satData->P7       = frqObs->_code;
-              if (frqObs->_phaseValid) satData->L7       = frqObs->_phase;
-              if (frqObs->_slip)       satData->slipFlag = true;
-            }
+        if (frqObs->_codeValid)  satData->P7       = frqObs->_code + cb;
+        if (frqObs->_phaseValid) satData->L7       = frqObs->_phase;
+        if (frqObs->_slip)       satData->slipFlag = true;
+      }
     }
     putNewObs(satData);
@@ -311 +332 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::putCodeBiases(const std::vector<t_satCodeBias*>& /* satCodeBias */) {
+void t_pppClient::putCodeBiases(const std::vector<t_satCodeBias*>& satCodeBias) {
+  for (unsigned ii = 0; ii < satCodeBias.size(); ii++) {
+    putCodeBias(new t_satCodeBias(*satCodeBias[ii]));
+  }
 }
 
@@ -385 +409 @@
 }
 
+void t_pppClient::putCodeBias(t_satCodeBias* satCodeBias) {
+  int iPrn = satCodeBias->_prn.toInt();
+  delete _satCodeBiases[iPrn];
+  _satCodeBiases[iPrn] = satCodeBias;
+}

trunk/BNC/src/PPP_SSR_I/pppClient.h

@@ -49 +49 @@
   std::ostringstream& log() {return *_log;}
   const t_pppOptions* opt() const {return _opt;}
-
+  void putCodeBias(t_satCodeBias* satCodeBias);
+  const t_satCodeBias* satCodeBias(const t_prn& prn) const {
+    return _satCodeBiases[prn.toInt()];
+  }
  private:
   t_irc getSatPos(const bncTime& tt, const QString& prn, ColumnVector& xc, ColumnVector& vv);
@@ -55 +58 @@
   t_irc cmpToT(t_satData* satData);
 
+  t_satCodeBias*       _satCodeBiases[t_prn::MAXPRN+1];
   bncEphUser*         _ephUser;
   t_pppOptions*       _opt;