Changeset 3521 in ntrip for trunk/BNC/bncpppclient.cpp
- Timestamp:
- Dec 14, 2011, 12:32:41 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/bncpppclient.cpp
r3519 r3521 376 376 if (eLast && eLast->IOD() == cc->iod) { 377 377 eLast->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data()); 378 return applyCorr(tt, cc, xc, vv , eLast);378 return applyCorr(tt, cc, xc, vv); 379 379 } 380 380 else if (ePrev && ePrev->IOD() == cc->iod) { 381 381 ePrev->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data()); 382 return applyCorr(tt, cc, xc, vv , ePrev);382 return applyCorr(tt, cc, xc, vv); 383 383 } 384 384 } … … 399 399 //////////////////////////////////////////////////////////////////////////// 400 400 t_irc bncPPPclient::applyCorr(const bncTime& tt, const t_corr* cc, 401 ColumnVector& xc, ColumnVector& vv, 402 const t_eph* eph) { 401 ColumnVector& xc, ColumnVector& vv) { 403 402 404 403 double dt = tt - cc->tt; … … 409 408 } 410 409 411 if (cc->xyzCorr) { 412 xc[0] += raoHlp[0]; 413 xc[1] += raoHlp[1]; 414 xc[2] += raoHlp[2]; 415 ColumnVector xcHlp(4); 416 ColumnVector vvHlp(3); 417 eph->position(cc->tt.gpsw(), cc->tt.gpssec(), xcHlp.data(), vvHlp.data()); 418 xc[3] += cc->dClk - xcHlp[3]; 419 } 420 else { 421 ColumnVector dx(3); 422 RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx); 423 xc[0] -= dx[0]; 424 xc[1] -= dx[1]; 425 xc[2] -= dx[2]; 426 xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt 427 + cc->hrClk; 428 } 410 ColumnVector dx(3); 411 RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx); 412 xc[0] -= dx[0]; 413 xc[1] -= dx[1]; 414 xc[2] -= dx[2]; 415 xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt 416 + cc->hrClk; 429 417 430 418 return success;
Note:
See TracChangeset
for help on using the changeset viewer.