Changeset 8912 in ntrip for trunk/BNC/src/PPP/pppClient.cpp

Timestamp:

Apr 6, 2020, 10:43:22 AM (4 years ago)

Author:

stuerze

Message:

minor changes regarding PPP (not completed)

File:

• trunk/BNC/src/PPP/pppClient.cpp (modified) (17 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -68 +68 @@
 
   if (_opt->_refSatRequired) {
-    for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-      char system = OPT->systems()[iSys];
+    for (unsigned iSys = 0; iSys < _opt->systems().size(); iSys++) {
+      char system = _opt->systems()[iSys];
       _obsPool->initRefSatMapElement(system);
     }
@@ -165 +165 @@
   for (unsigned ii = 0; ii < satObs.size(); ii++) {
     char system = satObs[ii]->_prn.system();
-    if (OPT->useSystem(system)) {
+    if (_opt->useSystem(system)) {
       t_pppSatObs* pppSatObs = new t_pppSatObs(*satObs[ii]);
       if (pppSatObs->isValid()) {
@@ -180 +180 @@
   if (_opt->_refSatRequired) {
     // reference satellite definition per system
-    for (unsigned iSys = 0; iSys < OPT->systems().size(); iSys++) {
-      char system = OPT->systems()[iSys];
+    for (unsigned iSys = 0; iSys < _opt->systems().size(); iSys++) {
+      char system = _opt->systems()[iSys];
       bool refSatDefined = false;
       t_pppRefSat* refSat = _obsPool->getRefSatMapElement(system);
@@ -187 +187 @@
         const t_pppSatObs* satObs = obsVector.at(ii);
         // reference satellite is unchanged
-        if      (!_obsPool->epoReProcessing() && refSat->prn() == satObs->prn()) {
+        if      (!_obsPool->refSatChangeRequired() && refSat->prn() == satObs->prn()) {
           refSatDefined = true;
           obsVector[ii]->setAsReference();
@@ -193 +193 @@
         }
         // reference satellite has changed
-        else if (_obsPool->epoReProcessing() && refSat->prn() != satObs->prn()) {
+        else if ( _obsPool->refSatChangeRequired() && refSat->prn() != satObs->prn()) {
           if (satObs->prn().system() == system) {
             refSatDefined = true;
@@ -217 +217 @@
       }
     }
-    _obsPool->setEpoReProcessing(false); //TODO: später erst nach Trafo false setzen
+    _obsPool->setRefSatChangeRequired(false);
   }
 
@@ -252 +252 @@
   bool pseudoObsIono = false;
 
-  if (OPT->_pseudoObsIono) {
+  if (_opt->_pseudoObsIono) {
     vector<t_pppSatObs*>::iterator it = obsVector.begin();
     while (it != obsVector.end()) {
@@ -295 +295 @@
         }
       }
-      if ( satObs->isValid(tLC) && (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle) ) {
+      if ( satObs->isValid(tLC) && (!satObs->modelSet() || satObs->eleSat() >= _opt->_minEle) ) {
         ++iObs;
         BB[iObs][0] = satObs->xc()[0];
@@ -303 +303 @@
       }
     }
-    if (iObs + 1 < OPT->_minObs) {
+    if (iObs + 1 < _opt->_minObs) {
       LOG << "t_pppClient::cmpBancroft not enough observations" << endl;
       return failure;
@@ -321 +321 @@
       if (satObs->isValid() &&
           satObs->prn().system() == 'G' &&
-          (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle) ) {
+          (!satObs->modelSet() || satObs->eleSat() >= _opt->_minEle) ) {
         ColumnVector rr = satObs->xc().Rows(1,3) - xyzc.Rows(1,3);
         double res = rr.NormFrobenius() - satObs->obsValue(tLC)
@@ -363 +363 @@
   double     offGG = 0.0;
 
-  if (OPT->useSystem('R')) {
+  if (_opt->useSystem('R')) {
     while (obsVector.size() > 0) {
       offGG = 0.0;
@@ -376 +376 @@
             tLC = satObs->isValid(t_lc::cIF) ? t_lc::cIF : t_lc::c1;
           }
-          if (satObs->isValid(tLC) && (!satObs->modelSet() || satObs->eleSat() >= OPT->_minEle)) {
+          if (satObs->isValid(tLC) && (!satObs->modelSet() || satObs->eleSat() >= _opt->_minEle)) {
             double ll = satObs->obsValue(tLC) - satObs->cmpValue(tLC);
             ++nObs;
@@ -465 +465 @@
   bncTime time;
   time = _epoTimeRover;
-  station->setName(OPT->_roverName);
-  station->setAntName(OPT->_antNameRover);
+  station->setName(_opt->_roverName);
+  station->setAntName(_opt->_antNameRover);
   station->setEpochTime(time);
-  if (OPT->xyzAprRoverSet()) {
-    station->setXyzApr(OPT->_xyzAprRover);
+  if (_opt->xyzAprRoverSet()) {
+    station->setXyzApr(_opt->_xyzAprRover);
   }
   else {
     station->setXyzApr(xyzc.Rows(1,3));
   }
-  station->setNeuEcc(OPT->_neuEccRover);
+  station->setNeuEcc(_opt->_neuEccRover);
 
   // Receiver Clock
@@ -495 +495 @@
     }
     if (satObs->isValid() &&
-        satObs->eleSat() >= OPT->_minEle &&
+        satObs->eleSat() >= _opt->_minEle &&
         modelSetup == success) {
-      if (satObs->isReference() && OPT->_pseudoObsIono) {
+      if (satObs->isReference() && _opt->_pseudoObsIono) {
         char system = satObs->prn().system();
         t_pppRefSat* refSat = _obsPool->getRefSatMapElement(system);
@@ -519 +519 @@
   try {
     initOutput(output);
-    _num = 0;
-    _obsPool->setEpoReProcessing(false); // initialize for epoch
+    int num = 0;
+    bool epochReProcessing = false;
 
     do {
-      _num++;
+      num++;
 
       // Prepare Observations of the Rover
@@ -550 +550 @@
       // Prepare Pseudo Observations of the Rover
       // ----------------------------------------
-      _pseudoObsIono = preparePseudoObs(_obsRover);//qDebug() << "_pseudoObsIonoAvailable: " << _pseudoObsIono;
-
-      if (int(_obsRover.size()) < OPT->_minObs) {
+      _pseudoObsIono = preparePseudoObs(_obsRover);
+      if (int(_obsRover.size()) < _opt->_minObs) {
         LOG << "t_pppClient::processEpoch not enough observations" << endl;
         return finish(failure);
       }
 
-      if (OPT->_refSatRequired) {
+      if (_opt->_refSatRequired) {
         LOG.setf(ios::fixed);
         QMapIterator<char, t_pppRefSat*> it(_obsPool->getRefSatMap());
@@ -575 +574 @@
       // Process Epoch in Filter
       // -----------------------
-      if (_filter->processEpoch(_num) != success) {
+      if (_filter->processEpoch(num) != success) {
         return finish(failure);
       }
-      // if num > 1 und !obsPool->epoReProcessing() => filter ->datumTransformation
-    } while (_obsPool->epoReProcessing());
+
+      // Epoch re-processing required?
+      // -----------------------------
+      if (_obsPool->refSatChangeRequired()) {
+        epochReProcessing = true;
+      }
+      else {
+        epochReProcessing = false;
+      }
+      // Datum transformation required?
+      // ------------------------------
+      if (num > 1 && epochReProcessing) {
+        _filter->datumTransformation();
+      }
+
+    } while (epochReProcessing);
   }
   catch (Exception& exc) {