Changeset 9537 in ntrip


Ignore:
Timestamp:
Nov 9, 2021, 1:12:39 PM (15 months ago)
Author:
stuerze
Message:

minor changes

Location:
trunk/BNC/src
Files:
4 edited

Legend:

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

    r9527 r9537  
    688688      else {
    689689        epochReProcessing = false;
    690         _filter->rememberState(0);
    691       }
    692 
     690        if (OPT->_obsModelType == OPT->DCMcodeBias ||
     691            OPT->_obsModelType == OPT->DCMphaseBias) {
     692          _filter->rememberState(0);
     693        }
     694      }
    693695    } while (epochReProcessing);
    694696
  • trunk/BNC/src/PPP/pppFilter.cpp

    r9534 r9537  
    119119      if (processSystem(OPT->LCs(sys), obsVector, _refPrn,
    120120                        epoch->pseudoObsIono(), preProcessing) != success) {
     121        LOG << "processSystem !=  success (pre-processing)" << endl;
    121122        _xFlt = xFltOld;
    122123        _QFlt = QFltOld;
     
    162163    if (processSystem(OPT->LCs(sys), obsVector, _refPrn,
    163164                      epoch->pseudoObsIono(), preProcessing) != success) {
     165      LOG << "processSystem !=  success (fin-processing)" << endl;
     166      _xFlt = xFltOld;
     167      _QFlt = QFltOld;
     168      if (OPT->_obsModelType == OPT->DCMcodeBias ||
     169          OPT->_obsModelType == OPT->DCMphaseBias) {
     170        _obsPool->deleteLastEpoch();
     171        restoreState(3);
     172      }
    164173      return failure;
    165174    }
     
    318327    // Check number of observations, truncate matrices
    319328    // -----------------------------------------------
    320     if (iObs == -1) {
     329    if (iObs == -1) {LOG << "iObs == -1\n";
    321330      return failure;
    322331    }
     
    716725    return success;
    717726  }
    718 //  LOG << "datumTransformation: printParams before set" << endl;
    719 //  _parlist.printParams(_epoTime);
     727  //LOG << "datumTransformation: printParams before set" << endl;
     728  //_parlist.printParams(_epoTime);
    720729
    721730  // set AA2
     
    814823  // ====================
    815824#ifdef BNC_DEBUG_PPP
    816 //      LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
    817 //      LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
     825      //LOG << "AA1\n"; _datumTrafo->printMatrix(_datumTrafo->AA1(), _datumTrafo->numObs(), _datumTrafo->numPar());
     826      //LOG << "AA2\n"; _datumTrafo->printMatrix(_datumTrafo->AA2(), _datumTrafo->numObs(), _datumTrafo->numPar());
    818827#endif
    819828  if(_datumTrafo->computeTrafoMatrix() != success) {
  • trunk/BNC/src/PPP/pppSatObs.cpp

    r9497 r9537  
    315315  retVal = sqrt(retVal);
    316316
     317  // De-Weight GLONASS
     318  // -----------------
     319  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
     320    retVal *= 5.0;
     321  }
     322
     323  // De-Weight BDS
     324  // -------------
     325  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
     326    retVal *= 2.0;
     327  }
     328
    317329  // Elevation-Dependent Weighting
    318330  // -----------------------------
     
    353365
    354366  retVal = sqrt(retVal);
     367
     368  // De-Weight GLONASS
     369  // -----------------
     370  if (_prn.system() == 'R' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
     371    retVal *= 2.0;
     372  }
     373
     374  // De-Weight BDS
     375  // -------------
     376  if (_prn.system() == 'C' && (t_lc::includesCode(tLC) ||  t_lc::includesPhase(tLC))) {
     377    retVal *= 2.0;
     378  }
     379
    355380
    356381  return retVal;
  • trunk/BNC/src/pppWidgets.cpp

    r9494 r9537  
    155155#else
    156156  _modelObs->addItems(QString("Ionosphere-free PPP,Uncombined PPP,PPP-RTK,DCM with Code Biases,DCM with Phase Biases").split(","));
    157   _pseudoObs->addItems(QString("no,Ionosphere&Troposphere").split(","));
     157  _pseudoObs->addItems(QString("no,Troposphere,Ionosphere,Ionosphere&Troposphere").split(","));
    158158#endif
    159159
Note: See TracChangeset for help on using the changeset viewer.