Changeset 5136 in ntrip


Ignore:
Timestamp:
Apr 19, 2013, 7:30:51 PM (9 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/rinex/reqcanalyze.cpp

    r5072 r5136  
    339339    newObs->_hasL1 = true;
    340340  }
    341   double L2 = obs.measdata("L2", 3.0);
     341  double L2 = obs.satSys == 'E' ? obs.measdata("L5", 3.0) : obs.measdata("L2", 3.0);;
    342342  if (L2 != 0) {
    343343    newObs->_hasL2 = true;
     
    354354  if (L1 != 0.0 && L2 != 0.0) {
    355355    double f1 = t_CST::f1(obs.satSys, obs.slotNum);
    356     double f2 = t_CST::f2(obs.satSys, obs.slotNum);
     356    double f2 = obs.satSys == 'E' ? t_CST::freq5 : t_CST::f2(obs.satSys, obs.slotNum);
    357357
    358358    L1 = L1 * t_CST::c / f1;
     
    364364      okFlag = true;
    365365    }
    366     double P2 = obs.measdata("C2", 3.0);
     366    double P2 = obs.satSys == 'E' ? obs.measdata("C5", 3.0) : obs.measdata("C2", 3.0);
    367367    if (P2 != 0.0) {
    368368      newObs->_MP2 = P2 - L2 - 2.0*f1*f1/(f1*f1-f2*f2) * (L1 - L2);
     
    390390    }
    391391  }
    392   double S2 = obs.measdata("S2", 3.0);
     392  double S2 = obs.satSys == 'E' ? obs.measdata("S5", 3.0) : obs.measdata("S2", 3.0);
    393393  if (S2 != 0.0) {
    394394    newObs->_SNR2 = floor(S2/6);
Note: See TracChangeset for help on using the changeset viewer.