Changeset 6160 in ntrip


Ignore:
Timestamp:
Sep 14, 2014, 11:13:25 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/combination/bnccomb.cpp

    r6159 r6160  
    547547      if (pp->type == cmbParam::clkSat) {
    548548        if (resCorr.find(pp->prn) != resCorr.end()) {
    549           resCorr[pp->prn]->_dClk = pp->xx / t_CST::c;
     549          resCorr[pp->prn]->_dClkResult = pp->xx / t_CST::c;
    550550        }
    551551      }
     
    669669      out << "Full Clock " << corr->_prn << " " << corr->_iod << " ";
    670670      out.setFieldWidth(14);
    671       out << (xc(4) + corr->_dClk) * t_CST::c << endl;
     671      out << (xc(4) + corr->_dClkResult) * t_CST::c << endl;
    672672      out.setFieldWidth(0);
    673673    }
     
    736736                 corr->_prn.toAscii().data(),
    737737                 corr->_iod,
    738                  corr->_dClk * t_CST::c,
     738                 corr->_dClkResult * t_CST::c,
    739739                 corr->_orbCorr._xr[0],
    740740                 corr->_orbCorr._xr[1],
     
    806806    }
    807807
    808     ll(iObs) = corr->_dClk * t_CST::c - DotProduct(AA.Row(iObs), x0);
     808    ll(iObs) = corr->_clkCorr._dClk * t_CST::c - DotProduct(AA.Row(iObs), x0);
    809809  }
    810810
     
    10011001            << corr->_acName << ' ' << corr->_prn;
    10021002        out.setFieldWidth(6);
    1003         out << " dClk = " << corr->_dClk * t_CST::c << " res = " << vv[ii] << endl;
     1003        out << " dClk = " << corr->_dClkResult * t_CST::c << " res = " << vv[ii] << endl;
    10041004        out.setFieldWidth(0);
    10051005      }
  • trunk/BNC/src/combination/bnccomb.h

    r6159 r6160  
    6666   public:
    6767    cmbCorr() {
    68       _eph = 0;
    69       _iod = 0;
     68      _eph        = 0;
     69      _iod        = 0;
     70      _dClkResult = 0.0;
    7071    }
    7172    ~cmbCorr() {}
     
    7475    int          _iod;
    7576    const t_eph* _eph;
    76     t_orbCorr    _orbCorr; // used for input
    77     t_clkCorr    _clkCorr; // used for input
     77    t_orbCorr    _orbCorr;
     78    t_clkCorr    _clkCorr;
    7879    QString      _acName;
    79     double       _dClk;    // used for output
     80    double       _dClkResult;
    8081    ColumnVector _diffRao;
    8182    QString ID() {return _acName + "_" + _prn;}
  • trunk/BNC/src/satObs.cpp

    r6158 r6160  
    66////////////////////////////////////////////////////////////////////////////
    77t_clkCorr::t_clkCorr() {
     8  _iod        = 0;
     9  _dClk       = 0.0;
     10  _dotDClk    = 0.0;
     11  _dotDotDClk = 0.0;
     12  _clkPartial = 0.0;
    813}
    914
     
    2227////////////////////////////////////////////////////////////////////////////
    2328t_orbCorr::t_orbCorr() {
     29  _xr.ReSize(3);    _xr    = 0.0;
     30  _dotXr.ReSize(3); _dotXr = 0.0;
     31  _iod    = 0;
     32  _system = 'R';
    2433}
    2534
     
    2736////////////////////////////////////////////////////////////////////////////
    2837t_orbCorr::t_orbCorr(const string& str) {
    29   _xr.ReSize(3);    _xr    = 0.0;
    30   _dotXr.ReSize(3); _dotXr = 0.0;
    3138}
    3239
Note: See TracChangeset for help on using the changeset viewer.