Changeset 6653 in ntrip

Timestamp:

Mar 12, 2015, 1:26:34 PM (9 years ago)

Author:

stuerze

Message:

sinex tro file support added,
troposphere results in overall ppp logfile added

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (1 diff)
• PPP/pppFilter.h (modified) (3 diffs)
• PPP_free/pppClient.cpp (modified) (1 diff)
• PPP_free/pppFilter.h (modified) (1 diff)
• bncsinextro.cpp (added)
• bncsinextro.h (added)
• pppInclude.h (modified) (1 diff)
• pppRun.cpp (modified) (4 diffs)
• pppRun.h (modified) (2 diffs)
• pppWidgets.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -336 +336 @@
     copy(&_filter->Q().data()[0], &_filter->Q().data()[6], _output->_covMatrix);
 
+    _output->_trp0     = t_tropo::delay_saast(_staRover->xyzApr(), M_PI/2.0);
+    _output->_trp      = _filter->trp();
+    _output->_trpStdev = _filter->trpStdev();
+
     _output->_numSat     = _filter->numSat();
     _output->_pDop       = _filter->PDOP();

trunk/BNC/src/PPP/pppFilter.h

@@ -28 +28 @@
   double PDOP() const {return _dop.P;}
   double GDOP() const {return _dop.G;}
+  double trp() const {
+    const std::vector<t_pppParam*>& par = _parlist->params();
+    for (unsigned ii = 0; ii < par.size(); ++ii) {
+      if (par[ii]->type() == t_pppParam::trp) {
+        return x()[ii];
+      }
+    }
+    return 0.0;
+  };
+  double trpStdev() const {
+    const std::vector<t_pppParam*>& par = _parlist->params();
+    for (unsigned ii = 0; ii < par.size(); ++ii) {
+      if (par[ii]->type() == t_pppParam::trp) {
+        return sqrt(Q()[ii][ii]);
+      }
+    }
+    return 0.0;
+  };
 
  private:
@@ -50 +68 @@
     double G;
   };
+
   t_irc processSystem(const std::vector<t_lc::type>& LCs, 
                       const std::vector<t_pppSatObs*>& obsVector);
@@ -60 +79 @@
 
   void cmpDOP(const std::vector<t_pppSatObs*>& obsVector);
+
+  void getTrp(void);
 
   void predictCovCrdPart(const SymmetricMatrix& QFltOld);

trunk/BNC/src/PPP_free/pppClient.cpp

@@ -145 +145 @@
     output->_numSat      = _filter->numSat();
     output->_pDop        = _filter->PDOP();
+    output->_trp0        = _filter->delay_saast(M_PI/2.0);
+    output->_trp         = _filter->trp();
   }
   else {

trunk/BNC/src/PPP_free/pppFilter.h

@@ -169 +169 @@
     return 0.0;
   }
+  double trpStdev() const {
+    for (unsigned ii = 0; ii < _params.size(); ++ii) {
+      t_pppParam* pp = _params[ii];
+      if (pp->type() == t_pppParam::TROPO) {
+        return sqrt(Q()[ii][ii]);
+      }
+    }
+    return 0.0;
+  }
   double Glonass_offset() const {
     for (int ii = 0; ii < _params.size(); ++ii) {

trunk/BNC/src/pppInclude.h

@@ -31 +31 @@
   double       _covMatrix[6]; 
   double       _neu[3];  
+  double       _trp0;
+  double       _trp;
+  double       _trpStdev;
   int          _numSat;       
   double       _pDop;         

trunk/BNC/src/pppRun.cpp

@@ -53 +53 @@
 #include "bncsettings.h"
 #include "bncoutf.h"
+#include "bncsinextro.h"
 #include "rinex/rnxobsfile.h"
 #include "rinex/rnxnavfile.h"
@@ -159 +160 @@
     }
     else {
-      snxtroFileSkl.replace("${STATION}", roverName);
-    }
-    _snxtroFile = new bncoutf(snxtroFileSkl, "1 day", 0);
+      snxtroFileSkl.replace("${STATION}", roverName.left(4));
+    }
+    int samplSnxTro = settings.value("PPP/snxtroSampl").toInt();
+    _snxtroFile = new bncSinexTro(_opt, snxtroFileSkl, "1 day", samplSnxTro);
   }
 }
@@ -272 +274 @@
           << " Y = "  << setprecision(4) << output._xyzRover[1]
           << " Z = "  << setprecision(4) << output._xyzRover[2]
-          << " NEU: " << setprecision(4) << output._neu[0]     
-          << " " << setprecision(4) << output._neu[1]     
-          << " " << setprecision(4) << output._neu[2];
+          << " NEU: " << showpos << setw(8) << setprecision(4) << output._neu[0]
+          << " "      << showpos << setw(8) << setprecision(4) << output._neu[1]
+          << " "      << showpos << setw(8) << setprecision(4) << output._neu[2]
+          << " TRP: " << showpos << setw(8) << setprecision(4) << output._trp0
+          << " "      << showpos << setw(8) << setprecision(4) << output._trp;
     }
 
@@ -294 +298 @@
 
     if (_snxtroFile && output._epoTime.valid()) {
-     // _snxtroFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(),QString("TEST"));
+      _snxtroFile->write(staID, int(output._epoTime.gpsw()), output._epoTime.gpssec(),
+                  output._trp0 + output._trp, output._trpStdev);
     }
 

trunk/BNC/src/pppRun.h

@@ -14 +14 @@
 class t_corrFile;
 class bncoutf;
+class bncSinexTro;
 
 namespace BNC_PPP {
@@ -72 +73 @@
   bncoutf*               _logFile;
   bncoutf*               _nmeaFile;
-  bncoutf*               _snxtroFile;
+  bncSinexTro*           _snxtroFile;
 };
 

trunk/BNC/src/pppWidgets.cpp

@@ -213 +213 @@
   _minEle->setValue(settings.value(_minEle->objectName()).toInt());
   _corrWaitTime->setValue(settings.value(_corrWaitTime->objectName()).toInt());
+  _snxtroSampl->setValue(settings.value(_snxtroSampl->objectName()).toInt());
 
   // Table with stations
@@ -264 +265 @@
   settings.setValue(_nmeaPort    ->objectName(), _nmeaPort    ->text());
   settings.setValue(_snxtroFile  ->objectName(), _snxtroFile  ->text());
+  settings.setValue(_snxtroSampl ->objectName(), _snxtroSampl ->value());
   settings.setValue(_lcGPS       ->objectName(), _lcGPS       ->currentText());
   settings.setValue(_lcGLONASS   ->objectName(), _lcGLONASS   ->currentText());