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

Timestamp:

Jun 27, 2022, 5:09:40 PM (22 months ago)

Author:

stuerze

Message:

some changes regarding PPP

File:

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

trunk/BNC/src/PPP/pppClient.cpp

@@ -304 +304 @@
     }
     if (iObs + 1 < _opt->_minObs) {
-      LOG << "t_pppClient::cmpBancroft not enough observations: " << iObs + 1  << endl;
+      LOG << "t_pppClient::cmpBancroft not enough observations: " << iObs + 1;
       return failure;
     }
@@ -335 +335 @@
       if (print && _numEpoProcessing == 1) {
         LOG.setf(ios::fixed);
+        LOG << "\nPPP of Epoch ";
+        if (!_epoTimeRover.undef()) LOG << string(_epoTimeRover);
+        LOG << "\n---------------------------------------------------------------\n";
         LOG << string(epoTime) << " BANCROFT:"        << ' '
             << setw(14) << setprecision(3) << xyzc[0] << ' '
@@ -376 +379 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::finish(t_irc irc, int ind) {
-
+#ifdef BNC_DEBUG_PPP
   LOG << "t_pppClient::finish(" << ind << "): " << irc << endl;
+#endif
 
   clearObs();
@@ -495 +499 @@
       }
 
-      if (_numEpoProcessing == 1) {
-        LOG << "\nPPP of Epoch ";
-        if (!_epoTimeRover.undef()) LOG << string(_epoTimeRover);
-        LOG << "\n---------------------------------------------------------------\n";
-      }
-
       for (int iter = 1; iter <= 2; iter++) {
         ColumnVector xyzc(4); xyzc = 0.0;
@@ -507 +505 @@
           return finish(failure,3);
         }
+
         if (cmpModel(_staRover, xyzc, _obsRover) != success) {
           return finish(failure,4);
@@ -525 +524 @@
       // use observations only if satellite code biases are available
       // ------------------------------------------------------------
-      if (!_opt->_corrMount.empty()&&
+      if (!_opt->_corrMount.empty() &&
           (OPT->_obsModelType == OPT->DCMcodeBias ||
            OPT->_obsModelType == OPT->DCMphaseBias)) {