Changeset 9819 in ntrip


Ignore:
Timestamp:
Sep 1, 2022, 4:29:40 PM (5 weeks ago)
Author:
stuerze
Message:

minor chenges to allow streams without code biases within the combination

Location:
trunk/BNC/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccore.cpp

    r9772 r9819  
    186186    QByteArray msgLocal = msg;
    187187    if (msg.indexOf('\n') == 0) {
    188       *_logStream << endl;
     188      *_logStream << "\r\n";
    189189      msgLocal = msg.mid(1);
    190190    }
    191191    *_logStream << currentDateAndTimeGPS().toString("yy-MM-dd hh:mm:ss ").toLatin1().data();
    192     *_logStream << msgLocal.data() << endl;
     192    *_logStream << msgLocal.data() << "\r\n";
    193193    _logStream->flush();
    194194    _logFile->flush();
  • trunk/BNC/src/combination/bnccomb.cpp

    r9710 r9819  
    211211  _rtnetDecoder = 0;
    212212
    213   connect(this,     SIGNAL(newMessage(QByteArray,bool)),
    214           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
    215 
    216   connect(BNC_CORE, SIGNAL(providerIDChanged(QString)),
    217           this,     SLOT(slotProviderIDChanged(QString)));
    218 
    219   connect(BNC_CORE, SIGNAL(newOrbCorrections(QList<t_orbCorr>)),
    220           this,     SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
    221 
    222   connect(BNC_CORE, SIGNAL(newClkCorrections(QList<t_clkCorr>)),
    223           this,     SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
    224 
    225   connect(BNC_CORE, SIGNAL(newCodeBiases(QList<t_satCodeBias>)),
    226           this,     SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));
     213  connect(this, SIGNAL(newMessage(QByteArray,bool)), BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
     214  connect(BNC_CORE, SIGNAL(providerIDChanged(QString)), this, SLOT(slotProviderIDChanged(QString)));
     215  connect(BNC_CORE, SIGNAL(newOrbCorrections(QList<t_orbCorr>)), this, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
     216  connect(BNC_CORE, SIGNAL(newClkCorrections(QList<t_clkCorr>)), this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
     217  connect(BNC_CORE, SIGNAL(newCodeBiases(QList<t_satCodeBias>)), this, SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));
    227218
    228219  // Combination Method
     
    561552    // Check satellite code biases
    562553    // ----------------------------
    563     if (!_satCodeBiases.contains(acName)) {
    564       delete newCorr;
    565       continue;
    566     }
    567     else {
     554    if (_satCodeBiases.contains(acName)) {
    568555      QMap<t_prn, t_satCodeBias>& storage = _satCodeBiases[acName];
    569       if (!storage.contains(clkCorr._prn)) {
    570         delete newCorr;
    571         continue;
    572       }
    573       else {
     556      if (storage.contains(clkCorr._prn)) {
    574557        newCorr->_satCodeBias = storage[clkCorr._prn];
    575558        QMap<t_frequency::type, double> codeBiasesRefSig;
     
    586569          }
    587570        }
    588         if (codeBiasesRefSig.size() < 2) {
    589           delete newCorr;
    590           continue;
    591         }
    592         map<t_frequency::type, double> codeCoeff;
    593         double channel = double(newCorr->_eph->slotNum());
    594         cmbRefSig::coeff(sys, cmbRefSig::cIF, channel, codeCoeff);
    595         map<t_frequency::type, double>::const_iterator it;
    596         for (it = codeCoeff.begin(); it != codeCoeff.end(); it++) {
    597           t_frequency::type frqType = it->first;
    598           newCorr->_codeBiasIF += it->second * codeBiasesRefSig[frqType];
     571        if (codeBiasesRefSig.size() == 2) {
     572          map<t_frequency::type, double> codeCoeff;
     573          double channel = double(newCorr->_eph->slotNum());
     574          cmbRefSig::coeff(sys, cmbRefSig::cIF, channel, codeCoeff);
     575          map<t_frequency::type, double>::const_iterator it;
     576          for (it = codeCoeff.begin(); it != codeCoeff.end(); it++) {
     577            t_frequency::type frqType = it->first;
     578            newCorr->_satCodeBiasIF += it->second * codeBiasesRefSig[frqType];
     579          }
    599580        }
    600581        newCorr->_satCodeBias._bias.clear();
     
    10501031    }
    10511032
    1052     ll(iObs) = (corr->_clkCorr._dClk * t_CST::c - corr->_codeBiasIF) - DotProduct(AA.Row(iObs), x0);
     1033    ll(iObs) = (corr->_clkCorr._dClk * t_CST::c - corr->_satCodeBiasIF) - DotProduct(AA.Row(iObs), x0);
     1034
    10531035  }
    10541036
  • trunk/BNC/src/combination/bnccomb.h

    r9695 r9819  
    8484   public:
    8585    cmbCorr() {
    86       _eph        = 0;
    87       _iod        = 0;
    88       _dClkResult = 0.0;
    89       _codeBiasIF = 0.0;
     86      _eph                        = 0;
     87      _iod                        = 0;
     88      _dClkResult                 = 0.0;
     89      _satCodeBiasIF              = 0.0;
    9090    }
    9191    ~cmbCorr() {}
     
    9898    t_satCodeBias  _satCodeBias;
    9999    QString        _acName;
    100     double         _codeBiasIF;
     100    double         _satCodeBiasIF;
    101101    double         _dClkResult;
    102102    ColumnVector   _diffRao;
Note: See TracChangeset for help on using the changeset viewer.