Changeset 6160 in ntrip

Timestamp:

Sep 14, 2014, 11:13:25 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• combination/bnccomb.cpp (modified) (5 diffs)
• combination/bnccomb.h (modified) (2 diffs)
• satObs.cpp (modified) (3 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -547 +547 @@
       if (pp->type == cmbParam::clkSat) {
         if (resCorr.find(pp->prn) != resCorr.end()) {
-          resCorr[pp->prn]->_dClk = pp->xx / t_CST::c;
+          resCorr[pp->prn]->_dClkResult = pp->xx / t_CST::c;
         }
       }
@@ -669 +669 @@
       out << "Full Clock " << corr->_prn << " " << corr->_iod << " ";
       out.setFieldWidth(14);
-      out << (xc(4) + corr->_dClk) * t_CST::c << endl;
+      out << (xc(4) + corr->_dClkResult) * t_CST::c << endl;
       out.setFieldWidth(0);
     }
@@ -736 +736 @@
                  corr->_prn.toAscii().data(),
                  corr->_iod,
-                 corr->_dClk * t_CST::c,
+                 corr->_dClkResult * t_CST::c,
                  corr->_orbCorr._xr[0],
                  corr->_orbCorr._xr[1],
@@ -806 +806 @@
     }
 
-    ll(iObs) = corr->_dClk * t_CST::c - DotProduct(AA.Row(iObs), x0);
+    ll(iObs) = corr->_clkCorr._dClk * t_CST::c - DotProduct(AA.Row(iObs), x0);
   }
 
@@ -1001 +1001 @@
             << corr->_acName << ' ' << corr->_prn;
         out.setFieldWidth(6);
-        out << " dClk = " << corr->_dClk * t_CST::c << " res = " << vv[ii] << endl;
+        out << " dClk = " << corr->_dClkResult * t_CST::c << " res = " << vv[ii] << endl;
         out.setFieldWidth(0);
       }

trunk/BNC/src/combination/bnccomb.h

@@ -66 +66 @@
    public:
     cmbCorr() {
-      _eph = 0;
-      _iod = 0;
+      _eph        = 0;
+      _iod        = 0;
+      _dClkResult = 0.0;
     }
     ~cmbCorr() {}
@@ -74 +75 @@
     int          _iod;
     const t_eph* _eph;
-    t_orbCorr    _orbCorr; // used for input
-    t_clkCorr    _clkCorr; // used for input
+    t_orbCorr    _orbCorr;
+    t_clkCorr    _clkCorr;
     QString      _acName; 
-    double       _dClk;    // used for output
+    double       _dClkResult;
     ColumnVector _diffRao;
     QString ID() {return _acName + "_" + _prn;}

trunk/BNC/src/satObs.cpp

@@ -6 +6 @@
 ////////////////////////////////////////////////////////////////////////////
 t_clkCorr::t_clkCorr() {
+  _iod        = 0;
+  _dClk       = 0.0;
+  _dotDClk    = 0.0;
+  _dotDotDClk = 0.0;
+  _clkPartial = 0.0;
 }
 
@@ -22 +27 @@
 ////////////////////////////////////////////////////////////////////////////
 t_orbCorr::t_orbCorr() {
+  _xr.ReSize(3);    _xr    = 0.0;
+  _dotXr.ReSize(3); _dotXr = 0.0;
+  _iod    = 0;
+  _system = 'R';
 }
 
@@ -27 +36 @@
 ////////////////////////////////////////////////////////////////////////////
 t_orbCorr::t_orbCorr(const string& str) {
-  _xr.ReSize(3);    _xr    = 0.0;
-  _dotXr.ReSize(3); _dotXr = 0.0;
 }