Changeset 9421 in ntrip


Ignore:
Timestamp:
May 4, 2021, 11:30:45 PM (17 months ago)
Author:
stuerze
Message:

update regarding PPP

File:
1 edited

Legend:

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

    r9419 r9421  
    133133    for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
    134134      char sys = OPT->systems()[iSys];
    135       if (OPT->_refSatRequired) {
    136         _refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
    137       }
     135      _refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
    138136     vector<t_pppSatObs*> obsVector;
    139137      for (unsigned jj = 0; jj < allObs.size(); jj++) {
     
    173171  // ------------------------------------
    174172  preProcessing = false;
     173  unsigned usableSys = 0;
    175174  for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
    176175    char sys = OPT->systems()[iSys];
    177176    if (OPT->_refSatRequired) {
    178177      _refPrn = (_obsPool->getRefSatMapElement(sys))->prn();
     178    }
     179    else {
     180      _refPrn.set(sys, 0);
    179181    }
    180182    unsigned int num = 0;
     
    188190    if (!num) {
    189191      continue;
     192    }
     193    else {
     194      ++usableSys;
     195      if (usableSys == 1 &&
     196          OPT->_obsModelType == OPT->UncombPPP) {
     197        _datumTrafo->setFirstSystem(sys);
     198      }
    190199    }
    191200    LOG << epoTimeStr << " SATNUM " << sys << ' ' << right << setw(2) << num << endl;
     
    296305    // ================
    297306    if (OPT->_pseudoObsTropo && _datumTrafo->firstSystem(sys)) {
     307      bool _pseudoObsTropoConsidered = false;
    298308      for (unsigned ii = 0; ii < obsVector.size(); ii++) {
     309        if (_pseudoObsTropoConsidered) {break;}
    299310        t_pppSatObs* obs = obsVector[ii];
    300         if (!obs->isReference()) {continue;}
    301311        for (unsigned jj = 0; jj < usedLCs; jj++) {
    302312          const t_lc::type tLC = LCs[jj];
    303313          if (tLC != t_lc::Tz0) {continue;}
    304314          ++iObs;
     315          _pseudoObsTropoConsidered = true;
    305316          usedObs.push_back(obs);
    306317          usedTypes.push_back(tLC);
     
    779790    // ================
    780791    if (OPT->_pseudoObsTropo && _datumTrafo->firstSystem(sys)) {
     792      bool pseudoObsTropoConsidered = false;
    781793      for (unsigned ii = 0; ii < obsVector.size(); ii++) {
     794        if (pseudoObsTropoConsidered) {break;}
    782795        t_pppSatObs* obs = obsVector[ii];
    783         if (!obs->isReference()) {continue;}
    784796        for (unsigned jj = 0; jj < usedLCs; jj++) {
    785797          const t_lc::type tLC = LCs[jj];
    786798          if (tLC != t_lc::Tz0) {continue;}
    787799          ++iObs;
     800          pseudoObsTropoConsidered = true;
    788801          for (unsigned iPar = 0; iPar < params.size(); iPar++) {
    789802            const t_pppParam* par = params[iPar];
Note: See TracChangeset for help on using the changeset viewer.