Changeset 10013 in ntrip for trunk/BNC

Timestamp:

Mar 18, 2023, 10:27:46 PM (21 months ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• PPP/pppFilter.cpp (modified) (6 diffs)
• PPP/pppFilter.h (modified) (2 diffs)
• PPP/pppSatObs.cpp (modified) (1 diff)
• pppWidgets.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppFilter.cpp

@@ -78 +78 @@
     return failure;
   }
-#ifdef BNC_DEBUG_PPP
-  if (OPT->_obsModelType == OPT->DCMcodeBias ||
-      OPT->_obsModelType == OPT->DCMphaseBias) {
-    _parlist.printParams(_epoTime);
-  }
-#endif
 
   // Status Vector, Variance-Covariance Matrix
@@ -419 +413 @@
     const vector<t_pppSatObs*> &obsVector, const t_prn &refPrn,
     bool preProcessing) {
-  const double SLIP = 50.0;
+  const double SLIP = 500.0;
   char sys = refPrn.system();
   string epoTimeStr = string(_epoTime);
@@ -513 +507 @@
       int ind = par->indexNew();
       t_lc::type tLC = par->tLC();
-      if (tLC != lc) {continue;}
+      //if (tLC != lc) {continue;}
       LOG << string(_epoTime) << " RESET " << par->toString() << endl;
       delete par;
@@ -719 +713 @@
   }
 
-#ifdef BNC_DEBUG_PPP
-  _parlist.printParams(_epoTime);
-#endif
-
   const QList<char> &usedSystems = _parlist.usedSystems();
   for (int iSys = 0; iSys < usedSystems.size(); iSys++) {
@@ -752 +742 @@
     unsigned nPar = _parlist.nPar();
 
-    Matrix AA(maxObs, nPar);
+    Matrix AA(maxObs, nPar); AA = 0.0;    cout << "AA Ncols/Nrows: " << AA.Ncols() << "/" << AA.Nrows() << "  nPar: "  << nPar << endl;
 
     // Real Observations
@@ -776 +766 @@
     }
     _datumTrafo->updateIndices(sys, iObs + 1);
-#ifdef BNC_DEBUG_PPP
-    LOG << "AA Ncols/Nrows: " << AA.Ncols() << "/" << AA.Nrows() << "  nPar: "  << nPar << endl;
-    LOG << "AA.SubMatrix(1 .. " << iObs+1 << " , 1 .. " <<  nPar << ")" << endl;
-#endif
+
     if (_datumTrafo->prepareAA(AA.SubMatrix(1, iObs + 1, 1, nPar), 2)  != success) {
       return failure;

trunk/BNC/src/PPP/pppFilter.h

@@ -106 +106 @@
       }
       _lastRow += maxObsSys;
-#ifdef BNC_DEBUG_PPP
-      LOG << sys << " updateIndices: lastRow: " << _lastRow << "\n" ;
-#endif
+
     };
 
@@ -138 +136 @@
     }
     t_irc prepareAA(const Matrix& AA, int ind) {
-#ifdef BNC_DEBUG_PPP
-      LOG << "prepare AA" << ind << "\n";
-#endif
+
       Matrix* Prep = &_AA2;
       if (ind == 1) {
         Prep = &_AA1;
       }
-#ifdef BNC_DEBUG_PPP
-      LOG << "_firstRow: " << _firstRow << " _lastRow: " << _lastRow << " _numPar " << _numPar << std::endl;
-      LOG << "AA.Ncols() > _numPar? " << AA.Ncols() << " / " << _numPar << std::endl;
-#endif
+
       if (AA.Ncols() > _numPar) {
         LOG << "t_pppFilter::prepareAA: AA.Ncols() > _numPar: " << AA.Ncols() << " > " << _numPar << std::endl;

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -33 +33 @@
 using namespace std;
 
-const double   GLO_WEIGHT_FACTOR = 1.0;
+const double   GLO_WEIGHT_FACTOR = 5.0;
 const double   BDS_WEIGHT_FACTOR = 1.0;
 

trunk/BNC/src/pppWidgets.cpp

@@ -210 +210 @@
   // ------------------
   _corrWaitTime->setWhatsThis(tr("<p>Zero value means that BNC processes each epoch of data immediately after its arrival using satellite clock corrections available at that time.</p><p> Specifying a non-zero value (i.e. 5 sec) means that the epochs of data are buffered and the processing of each epoch is postponed till the satellite clock corrections not older than '5 sec' (example) become available. <i>[key: PPP/corrWaitTime]</i><p>"));
-  _seedingTime->setWhatsThis(tr("<p>Enter the length of a startup period in seconds for which you want to fix the PPP solutions to known a priori coordinates as introduced through option 'Coordinates file'. Adjust 'Sigma N/E/H' in the PPP Stations table according to the coordinate's precision. Fixing a priori coordinates is done in BNC through setting 'Sigma N/E/H' temporarily to zero.</p><p>This option allows the PPP solution to rapidly converge. It requires that the antenna remains unmoved on the a priori known position throughout the startup period.</p><p>A value of 60 is likely to be an appropriate choice.</p><p>Default is an empty option field, meaning that you don't want BNC to fix PPP solutions during startup to an a priori coordinate. <i>[key: PPP/seedingTime]</i></p>"));
+  _seedingTime->setWhatsThis(tr("<p>Enter the length of a startup period in seconds for which you want to fix the PPP solutions to known a priori coordinates as introduced through option 'Coordinates file'. Adjust 'Sigma N/E/H' in the PPP Stations table according to the coordinate's precision. Fixing a priori coordinates is done in BNC through setting 'Noise N/E/H' temporarily to zero.</p><p>This option allows the PPP solution to rapidly converge. It requires that the antenna remains unmoved on the a priori known position throughout the startup period.</p><p>A value of 60 is likely to be an appropriate choice.</p><p>Default is an empty option field, meaning that you don't want BNC to fix PPP solutions during startup to an a priori coordinate. <i>[key: PPP/seedingTime]</i></p>"));
 
   // WhatsThis, PPP (3)