Changeset 6031 in ntrip for trunk/BNC/src/PPP/pppSatObs.cpp


Ignore:
Timestamp:
Aug 21, 2014, 11:41:43 AM (8 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppSatObs.cpp

    r6030 r6031  
    474474double t_pppSatObs::cmpValue(t_lc::type tLC) const {
    475475
    476   if (!_validObs2 && t_lc::need2ndFreq(tLC)) {
     476  if (!isValid(tLC)) {
    477477    return 0.0;
    478478  }
     
    486486  // Add Dispersive Part
    487487  // -------------------
    488   double L1 = nonDisp + _model._antPco1 - _model._biasL1 + _model._windUp * t_CST::c / _f1;
    489   double L2 = nonDisp + _model._antPco2 - _model._biasL2 + _model._windUp * t_CST::c / _f2;
    490   double C1 = nonDisp + _model._antPco1 - _model._biasC1;
    491   double C2 = nonDisp + _model._antPco2 - _model._biasC2;
    492 
    493   return this->lc(tLC, L1, L2, C1, C2);
     488  map<t_frequency::type, double> codeCoeff;
     489  map<t_frequency::type, double> phaseCoeff;
     490  lcCoeff(tLC, codeCoeff, phaseCoeff);
     491
     492  double dispPart = 0.0;
     493
     494  map<t_frequency::type, double>::const_iterator it;
     495  for (it = codeCoeff.begin(); it != codeCoeff.end(); it++) {
     496    t_frequency::type tFreq = it->first;
     497    dispPart += it->second * (_model._antPCO[tFreq] + _model._codeBias[tFreq]);
     498  }
     499  for (it = phaseCoeff.begin(); it != phaseCoeff.end(); it++) {
     500    t_frequency::type tFreq = it->first;
     501    dispPart += it->second * (_model._antPCO[tFreq] + _model._phaseBias[tFreq]);
     502  }
     503
     504//  double L1 = nonDisp + _model._antPco1 - _model._biasL1 + _model._windUp * t_CST::c / _f1;
     505//  double L2 = nonDisp + _model._antPco2 - _model._biasL2 + _model._windUp * t_CST::c / _f2;
     506//  double C1 = nonDisp + _model._antPco1 - _model._biasC1;
     507//  double C2 = nonDisp + _model._antPco2 - _model._biasC2;
     508
     509    return nonDisp + dispPart;
    494510}
    495511
Note: See TracChangeset for help on using the changeset viewer.