Changeset 8564 in ntrip


Ignore:
Timestamp:
Dec 13, 2018, 9:57:57 AM (10 months ago)
Author:
mervart
Message:

Analyze more than two signals

File:
1 edited

Legend:

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

    r8562 r8564  
    382382      t_frequency::type fB = t_frequency::dummy;
    383383      char sys             = satObs._prn.system();
    384       for (int iSig = 1; iSig < _signalTypes[sys].size(); iSig++) {
    385         std::string frqType1, frqType2;
    386         if (_signalTypes.find(sys) != _signalTypes.end()) {
    387           frqType1.push_back(sys);
    388           frqType1.push_back(_signalTypes[sys][0]);
    389           frqType2.push_back(sys);
    390           frqType2.push_back(_signalTypes[sys][iSig]);
    391           if      (frqObs->_rnxType2ch[0] == frqType1[1]) {
    392             fA = t_frequency::toInt(frqType1);
    393             fB = t_frequency::toInt(frqType2);
    394           }
    395           else if (frqObs->_rnxType2ch[0] == frqType2[1]) {
    396             fA = t_frequency::toInt(frqType2);
    397             fB = t_frequency::toInt(frqType1);
     384      if (_signalTypes.find(sys) != _signalTypes.end()) {
     385        for (int iSig = 0; iSig < _signalTypes[sys].size(); iSig++) {
     386          if (frqObs->_rnxType2ch[0] == _signalTypes[sys][iSig]) {
     387            string frqType; frqType.push_back(sys); frqType.push_back(_signalTypes[sys][iSig]);
     388            fA = t_frequency::toInt(frqType);
     389            break;
     390          }
     391        }
     392        if (fA != t_frequency::dummy) {
     393          for (int iSig = 0; iSig < _signalTypes[sys].size(); iSig++) {
     394            string frqType; frqType.push_back(sys); frqType.push_back(_signalTypes[sys][iSig]);
     395            t_frequency::type fHlp = t_frequency::toInt(frqType);
     396            if (fA != fHlp) {
     397              fB = fHlp;
     398              break;
     399            }
    398400          }
    399401        }
    400402        if (fA != t_frequency::dummy && fB != t_frequency::dummy) {
     403
    401404          double f_a = t_CST::freq(fA, qcSat._slotNum);
    402405          double f_b = t_CST::freq(fB, qcSat._slotNum);
Note: See TracChangeset for help on using the changeset viewer.