Changeset 9548 in ntrip for trunk


Ignore:
Timestamp:
Nov 18, 2021, 4:55:06 PM (8 months ago)
Author:
stuerze
Message:

update regarding PPP

Location:
trunk/BNC/src/PPP
Files:
4 edited

Legend:

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

    r9545 r9548  
    507507//
    508508//////////////////////////////////////////////////////////////////////////////
    509 void t_pppClient::finish(t_irc irc, int ind) {// LOG << "t_pppClient::finish(" << irc << ") " << ind << endl;
     509void t_pppClient::finish(t_irc irc, int ind) { //LOG << "t_pppClient::finish(" << irc << ") " << ind << endl;
    510510
    511511  clearObs();
     
    606606        if(_filter->datumTransformation(_refSatMap) != success) {
    607607          LOG << "t_pppFilter::datumTransformation() != success" << endl;
     608          reset();
    608609          return finish(failure,1);
    609610        }
     
    915916    t_prn prn = it.value()->prn();
    916917    char sys = prn.system();
    917     if (_obsPool->refSatChangeRequired(sys)){
     918    if (_obsPool->refSatChangeRequired(sys)) {
    918919      _historicalRefSats[sys].append(prn);
    919920    }
     
    923924//
    924925//////////////////////////////////////////////////////////////////////////////
    925 void t_pppClient::reset() {
     926void t_pppClient::reset() {LOG << "t_pppClient::reset()" << endl;
    926927
    927928  // to delete old orbit and clock corrections
  • trunk/BNC/src/PPP/pppFilter.cpp

    r9545 r9548  
    249249          const t_lc::type tLC = LCs[jj];
    250250          if (tLC == t_lc::GIM) {continue;}
    251           if (tLC == t_lc::Tz0) {continue;}
    252251          ++iObs;
    253252          usedObs.push_back(obs);
     
    683682  const QMap<char, t_pppRefSat*>& refSatMapLastEpoch = epoch->refSatMap();
    684683
    685   bool peseudoObsIono = epoch->pseudoObsIono();
     684  bool pseudoObsIono = epoch->pseudoObsIono();
    686685
    687686  // reset old and set new refSats in last epoch (ambiguities/GIM)
    688687  // =============================================================
    689688  if (resetRefSatellitesLastEpoch(allObs, refSatMap, refSatMapLastEpoch) != true) {
    690     LOG  << "datumTransformation: refsatChange required" << endl;
    691     return success;
     689    LOG  << "datumTransformation: resetRefSatellitesLastEpoch != success" << endl;
     690    return failure;
    692691  }
    693692
    694693  if (OPT->_obsModelType == OPT->UncombPPP) {
    695     _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
     694    _obsPool->putEpoch(_epoTime, allObs, pseudoObsIono, refSatMap);
    696695    return success;
    697696  }
     
    724723    vector<t_lc::type> LCs = OPT->LCs(sys);
    725724    unsigned usedLCs = LCs.size();
    726     if (OPT->_pseudoObsIono && !peseudoObsIono) {
     725    if (OPT->_pseudoObsIono && !pseudoObsIono) {
    727726        usedLCs -= 1;  // GIM not used
    728727    }
     
    730729    unsigned maxObs = obsVector.size() * usedLCs;
    731730
    732     if (OPT->_pseudoObsIono && peseudoObsIono) {
     731    if (OPT->_pseudoObsIono && pseudoObsIono) {
    733732      maxObs -= 1; // pseudo obs iono with respect to refSat
    734733    }
     
    747746        const t_lc::type tLC = LCs[jj];
    748747        if (tLC == t_lc::GIM) {continue;}
    749         if (tLC == t_lc::Tz0) {continue;}
    750748        ++iObs;
    751749        for (unsigned iPar = 0; iPar < nPar; iPar++) {
     
    769767  // ====================
    770768#ifdef BNC_DEBUG_PPP
    771       //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
    772       //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
     769  //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
     770  //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
    773771#endif
    774772  if(_datumTrafo->computeTrafoMatrix() != success) {
     
    776774  }
    777775#ifdef BNC_DEBUG_PPP
    778       //LOG << "D21" << endl; _datumTrafo->printMatrix(_datumTrafo->D21(), _datumTrafo->numObs(), _datumTrafo->numPar());
     776  //LOG << "D21" << endl; _datumTrafo->printMatrix(_datumTrafo->D21(), _datumTrafo->numObs(), _datumTrafo->numPar());
    779777#endif
    780778  ColumnVector    xFltOld = _xFlt;
     
    809807  _datumTrafo->switchAA();
    810808
    811   _obsPool->putEpoch(_epoTime, allObs, peseudoObsIono, refSatMap);
     809  _obsPool->putEpoch(_epoTime, allObs, pseudoObsIono, refSatMap);
    812810
    813811  return success;
  • trunk/BNC/src/PPP/pppParlist.cpp

    r9545 r9548  
    183183  switch (_type) {
    184184  case crdX:
    185     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     185    if (tLC == t_lc::GIM) {return 0.0;}
    186186    return (sta->xyzApr()[0] - obs->xc()[0]) / rhoV.NormFrobenius();
    187187  case crdY:
    188     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     188    if (tLC == t_lc::GIM) {return 0.0;}
    189189    return (sta->xyzApr()[1] - obs->xc()[1]) / rhoV.NormFrobenius();
    190190  case crdZ:
    191     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     191    if (tLC == t_lc::GIM) {return 0.0;}
    192192    return (sta->xyzApr()[2] - obs->xc()[2]) / rhoV.NormFrobenius();
    193193  case clkR:
    194     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     194    if (tLC == t_lc::GIM) {return 0.0;}
    195195    return 1.0;
    196196  case offGR:
    197     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     197    if (tLC == t_lc::GIM) {return 0.0;}
    198198    return (obs->prn().system() == 'R') ? 1.0 : 0.0;
    199199  case offGE:
    200     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     200    if (tLC == t_lc::GIM) {return 0.0;}
    201201    return (obs->prn().system() == 'E') ? 1.0 : 0.0;
    202202  case offGC:
    203     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     203    if (tLC == t_lc::GIM) {return 0.0;}
    204204    return (obs->prn().system() == 'C') ? 1.0 : 0.0;
    205205  case amb:
    206     if      (tLC == t_lc::GIM || tLC == t_lc::Tz0) {return 0.0;}
     206    if      (tLC == t_lc::GIM) {return 0.0;}
    207207    else if ((OPT->_obsModelType == OPT->IF)     ||
    208208             (OPT->_obsModelType == OPT->PPPRTK) ||
     
    232232    if      (tLC == t_lc::GIM) {
    233233      return 0.0;
    234     }
    235     else if (tLC == t_lc::Tz0) {
    236       return 1.0;
    237234    }
    238235    else {
     
    544541                par->type() == t_pppParam::pBiasG1 ||
    545542                par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('G')) {
    546         delete par;
    547543#ifdef BNC_DEBUG_PPP
    548544        LOG << "remove1 " << par->toString() << std::endl;
    549545#endif
    550        it = _params.erase(it);
     546        delete par;
     547        it = _params.erase(it);
    551548      }
    552549      else if ((par->type() == t_pppParam::cBiasR1 ||
     
    554551                par->type() == t_pppParam::pBiasR1 ||
    555552                par->type() == t_pppParam::pBiasR2) && !usedSystems().contains('R')) {
    556         delete par;
    557553#ifdef BNC_DEBUG_PPP
    558554        LOG << "remove1 " << par->toString() << std::endl;
    559555#endif
    560        it = _params.erase(it);
     556        delete par;
     557        it = _params.erase(it);
    561558      }
    562559      else if ((par->type() == t_pppParam::cBiasE1 ||
     
    564561                par->type() == t_pppParam::pBiasE1 ||
    565562                par->type() == t_pppParam::pBiasE2) && !usedSystems().contains('E')) {
    566         delete par;
    567563#ifdef BNC_DEBUG_PPP
    568564        LOG << "remove1 " << par->toString() << std::endl;
    569565#endif
    570        it = _params.erase(it);
     566        delete par;
     567        it = _params.erase(it);
    571568      }
    572569      else if ((par->type() == t_pppParam::cBiasC1 ||
    573570                par->type() == t_pppParam::cBiasC2 ||
    574571                par->type() == t_pppParam::pBiasC1 ||
    575                 par->type() == t_pppParam::pBiasG2) && !usedSystems().contains('C')) {
    576         delete par;
     572                par->type() == t_pppParam::pBiasC2) && !usedSystems().contains('C')) {
    577573#ifdef BNC_DEBUG_PPP
    578574        LOG << "remove1 " << par->toString() << std::endl;
    579575#endif
    580        it = _params.erase(it);
     576        delete par;
     577        it = _params.erase(it);
    581578      }
    582579      else {
  • trunk/BNC/src/PPP/pppSatObs.cpp

    r9539 r9548  
    9393  for (unsigned ii = 0; ii < OPT->LCs(_prn.system()).size(); ii++) {
    9494    t_lc::type tLC = OPT->LCs(_prn.system())[ii];
    95     if (tLC == t_lc::GIM || tLC == t_lc::Tz0) {continue;}
     95    if (tLC == t_lc::GIM) {continue;}
    9696    if (!isValid(tLC)) {
    9797      _valid = false;
     
    191191    return;
    192192  case t_lc::GIM:
    193   case t_lc::Tz0:
    194193  case t_lc::dummy:
    195194  case t_lc::maxLc:
     
    222221      return _stecRefSat;
    223222    }
    224   }
    225 
    226   if (tLC == t_lc::Tz0) {
    227     return _model._tropo0;
    228223  }
    229224
     
    310305
    311306  retVal = sqrt(retVal);
    312 
     307/*
    313308  // De-Weight GLONASS
    314309  // -----------------
     
    322317    retVal *= 2.0;
    323318  }
    324 
     319*/
    325320  // Elevation-Dependent Weighting
    326321  // -----------------------------
     
    358353
    359354  retVal = sqrt(retVal);
    360 
     355/*
    361356  // De-Weight GLONASS
    362357  // -----------------
    363358  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
    364     retVal *= 2.0;
     359    retVal *= 5.0;
    365360  }
    366361
     
    370365    retVal *= 2.0;
    371366  }
    372 
     367*/
    373368
    374369  return retVal;
     
    645640    cmpValue =  _stecSat;
    646641  }
    647   else if (tLC == t_lc::Tz0) {
    648     cmpValue = _model._tropo0;
    649   }
    650642  else {
    651643    // Non-Dispersive Part
Note: See TracChangeset for help on using the changeset viewer.