Changeset 5849 in ntrip


Ignore:
Timestamp:
Aug 7, 2014, 12:20:26 PM (8 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/ephemeris.cpp

    r5839 r5849  
    6565  if (useCorr) {
    6666    if (_orbCorr && _clkCorr) {
    67       ColumnVector xr = _orbCorr->getX(tt);
     67
     68      double dtO = tt - _orbCorr->_time;
    6869      ColumnVector dx(3);
     70      dx[0] = _orbCorr->_xr[0] + _orbCorr->_dotXr[0] * dtO;
     71      dx[1] = _orbCorr->_xr[1] + _orbCorr->_dotXr[1] * dtO;
     72      dx[2] = _orbCorr->_xr[2] + _orbCorr->_dotXr[2] * dtO;
     73
    6974      if (_orbCorr->_system == 'R') {
    70         RSW_to_XYZ(xc.Rows(1,3), vv.Rows(1,3), xr, dx);
    71       }
    72       else {
    73         dx = xr;
    74       }
     75        RSW_to_XYZ(xc.Rows(1,3), vv.Rows(1,3), dx, dx);
     76      }
     77
    7578      xc[0] -= dx[0];
    7679      xc[1] -= dx[1];
    7780      xc[2] -= dx[2];
    78       xc[3] += _clkCorr->getClk(tt);
     81
     82      double dtC = tt - _clkCorr->_time;
     83      xc[3] += _clkCorr->_dClk + _clkCorr->_dotDClk * dtC + _clkCorr->_dotDotDClk * dtC * dtC;
    7984    }
    8085    else {
Note: See TracChangeset for help on using the changeset viewer.