Changeset 9552 in ntrip for trunk/BNC/src

Timestamp:

Nov 24, 2021, 11:33:13 AM (3 years ago)

Author:

stuerze

Message:

update regarding PPP

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (1 diff)
• PPP/pppFilter.h (modified) (1 diff)
• PPP/pppSatObs.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (2 diffs)
• pppMain.cpp (modified) (1 diff)
• pppOptions.h (modified) (1 diff)
• pppWidgets.cpp (modified) (4 diffs)
• pppWidgets.h (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -669 +669 @@
       if (_filter->processEpoch() != success) {
         LOG << "filter->processEpoch() != success" << endl;
-        if (_filter->ageOfLastSolutionOK() >= 120) {
-          reset();
-        }
         return finish(failure,7);
       }

trunk/BNC/src/PPP/pppFilter.h

@@ -61 +61 @@
     return 0.0;
   };
-  double ageOfLastSolutionOK() { return (_epoTime - _lastEpoTimeOK);}
 
  private:

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -344 +344 @@
   }
   if (tLC == t_lc::GIM) {
-    retVal = 3.0 * (OPT->_sigmaGIM * OPT->_sigmaGIM + OPT->_sigmaGIM * OPT->_sigmaGIM);
+    retVal = it->second * it->second * OPT->_maxResGIM * OPT->_maxResGIM;
   }
 

trunk/BNC/src/bncwindow.cpp

@@ -1063 +1063 @@
   pppLayout3->addWidget(_pppWidgets._sigmaGIM,              ir, 4); _pppWidgets._sigmaGIM->setMaximumWidth(8*ww);
   pppLayout3->addItem(new QSpacerItem(8*ww, 0),             ir, 5);
+  pppLayout3->addWidget(new QLabel("Max Res GIM"),            ir, 6, Qt::AlignLeft);
+  pppLayout3->addWidget(_pppWidgets._maxResGIM,        ir, 7); _pppWidgets._maxResGIM->setMaximumWidth(8*ww);
   ++ir;
-  pppLayout3->addWidget(new QLabel(""),                     ir, 6);
+  pppLayout3->addWidget(new QLabel(""),                     ir, 8);
   pppLayout3->setColumnStretch(8, 999);
   ++ir;
@@ -1454 +1456 @@
   _pppWidgets._sigmaL1->setWhatsThis(tr("<p>Enter a Sigma for GPS L1 phase observations in meters.</p><p>The higher the sigma you enter, the less the contribution of L1 phase observations to a PPP solutions from combined code and phase data. 0.01 is likely to be an appropriate choice.</p><p>Default is an empty option field, meaning<br>'Sigma L1 = 0.01' <i>[key: PPP/sigmaL1]</i></p>"));
   _pppWidgets._sigmaGIM->setWhatsThis(tr("<p>Enter a Sigma for GIM pseudo observations in meters.</p><p>The higher the sigma you enter, the less the contribution of GIM pseudo observations to a PPP solution. 3.0 is likely to be an appropriate choice.</p><p>Default is an empty option field, meaning<br>'Sigma GIM = 3.0' <i>[key: PPP/sigmaGIM]</i></p>"));
-  _pppWidgets._maxResC1->setWhatsThis(tr("<p>Specify a maximum for residuals from GPS C1 code observations in a PPP solution. '3.0' meters may be an appropriate choice for that.</p><p>If the maximum is exceeded, contributions from the corresponding observation will be ignored in the PPP solution.</p><p>Default is an empty option field, meaning<br>'Max Rex C1 = 3.0' <i>[key: PPP/maxResC1]</i></p>"));
-  _pppWidgets._maxResL1->setWhatsThis(tr("<p>Specify a maximum for residuals from GPS L1 code observations in a PPP solution. '0.03' meters may be an appropriate choice for that.</p><p>If the maximum is exceeded, contributions from the corresponding observation will be ignored in the PPP solution.</p><p>Default is an empty option field, meaning<br>'Max Rex L1 = 0.03' <i>[key: PPP/maxResL1]</i></p>"));
+  _pppWidgets._maxResC1->setWhatsThis(tr("<p>Specify a maximum for residuals from GPS C1 code observations in a PPP solution. '3.0' meters may be an appropriate choice for that.</p><p>If the maximum is exceeded, contributions from the corresponding observation will be ignored in the PPP solution.</p><p>Default is an empty option field, meaning<br>'Max Res C1 = 3.0' <i>[key: PPP/maxResC1]</i></p>"));
+  _pppWidgets._maxResL1->setWhatsThis(tr("<p>Specify a maximum for residuals from GPS L1 code observations in a PPP solution. '0.03' meters may be an appropriate choice for that.</p><p>If the maximum is exceeded, contributions from the corresponding observation will be ignored in the PPP solution.</p><p>Default is an empty option field, meaning<br>'Max Res L1 = 0.03' <i>[key: PPP/maxResL1]</i></p>"));
+  _pppWidgets._maxResGIM->setWhatsThis(tr("<p>Specify a maximum for residuals from GIM pseudo observations in a PPP solution. '6.0' meters may be an appropriate choice for that.</p><p>If the maximum is exceeded, contributions from the corresponding observation will be ignored in the PPP solution.</p><p>Default is an empty option field, meaning<br>'Max Res L1 = 1.0' <i>[key: PPP/maxResGIM]</i></p>"));
   _pppWidgets._eleWgtCode->setWhatsThis(tr("<p>Tic 'Ele Wgt Code' to use satellite Elevation depending Weights for Code observations in the PPP solution. <i>[key: PPP/eleWgtCode]</i></p>"));
   _pppWidgets._eleWgtPhase->setWhatsThis(tr("<p>Tic 'Ele Wgt Phase' to use satellite Elevation depending Weights for Phase observations in the PPP solution. <i>[key: PPP/eleWgtPhase]</i></p>"));

trunk/BNC/src/pppMain.cpp

@@ -409 +409 @@
     opt->_maxResC1    = settings.value("PPP/maxResC1").toDouble(); if (opt->_maxResC1 <= 0.0) opt->_maxResC1 = 3.0;
     opt->_maxResL1    = settings.value("PPP/maxResL1").toDouble(); if (opt->_maxResL1 <= 0.0) opt->_maxResL1 = 0.03;
+    opt->_maxResGIM   = settings.value("PPP/maxResGIM").toDouble(); if (opt->_maxResGIM <= 0.0) opt->_maxResGIM = 6.0;
     opt->_eleWgtCode  = (settings.value("PPP/eleWgtCode").toInt() != 0);
     opt->_eleWgtPhase = (settings.value("PPP/eleWgtPhase").toInt() != 0);

trunk/BNC/src/pppOptions.h

@@ -54 +54 @@
   double                  _maxResC1;
   double                  _maxResL1;
+  double                  _maxResGIM;
   bool                    _eleWgtCode;
   bool                    _eleWgtPhase;

trunk/BNC/src/pppWidgets.cpp

@@ -89 +89 @@
   _maxResC1     = new QLineEdit();     _maxResC1    ->setObjectName("PPP/maxResC1");     _widgets << _maxResC1;
   _maxResL1     = new QLineEdit();     _maxResL1    ->setObjectName("PPP/maxResL1");     _widgets << _maxResL1;
+  _maxResGIM    = new QLineEdit();     _maxResGIM   ->setObjectName("PPP/maxResGIM");    _widgets << _maxResGIM;
   _minObs       = new QSpinBox();      _minObs      ->setObjectName("PPP/minObs");       _widgets << _minObs;
   _minEle       = new QSpinBox();      _minEle      ->setObjectName("PPP/minEle");       _widgets << _minEle;
@@ -258 +259 @@
   delete _maxResC1;
   delete _maxResL1;
+  delete _maxResGIM;
   delete _minObs;
   delete _minEle;
@@ -367 +369 @@
     _maxResL1->setText("0.03");
   }
+
+  if (!settings.value(_maxResGIM->objectName()).toString().isEmpty()) {
+    _maxResGIM->setText(settings.value(_maxResGIM->objectName()).toString());
+  }
+  else {
+    _maxResGIM->setText("6.0");
+  }
+
 
   if (!settings.value(_seedingTime->objectName()).toString().isEmpty()) {
@@ -459 +469 @@
   settings.setValue(_maxResC1    ->objectName(), _maxResC1    ->text());
   settings.setValue(_maxResL1    ->objectName(), _maxResL1    ->text());
+  settings.setValue(_maxResGIM   ->objectName(), _maxResGIM   ->text());
   settings.setValue(_seedingTime ->objectName(), _seedingTime ->text());
   settings.setValue(_minObs      ->objectName(), _minObs      ->value());

trunk/BNC/src/pppWidgets.h

@@ -75 +75 @@
   QLineEdit*     _maxResC1;
   QLineEdit*     _maxResL1;
+  QLineEdit*     _maxResGIM;
   QCheckBox*     _eleWgtCode;
   QCheckBox*     _eleWgtPhase;