Changeset 5914 in ntrip

Timestamp:

Aug 12, 2014, 4:51:03 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (3 diffs)
• pppEphPool.cpp (modified) (1 diff)
• pppParlist.cpp (modified) (7 diffs)
• pppParlist.h (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -82 +82 @@
   _tides    = new t_tides();
 
-  if (!_opt->_antexFile.empty()) {
-    _antex = new bncAntex(_opt->_antexFile.c_str());
+  if (!_opt->_antexFileName.empty()) {
+    _antex = new bncAntex(_opt->_antexFileName.c_str());
   }
   else {
@@ -206 +206 @@
                                   ColumnVector& xyzc, bool print) {
 
-  t_lc::type tLC = (OPT->dualFreqRequired() ? t_lc::cIF : t_lc::c1);
+  t_lc::type tLC = (OPT->dualFreqRequired('G') ? t_lc::cIF : t_lc::c1);
 
   while (true) {
@@ -276 +276 @@
 double t_pppClient::cmpOffGG(vector<t_pppSatObs*>& obsVector) {
 
-  t_lc::type tLC   = (OPT->dualFreqRequired() ? t_lc::cIF : t_lc::c1);
+  t_lc::type tLC   = (OPT->dualFreqRequired('R') ? t_lc::cIF : t_lc::c1);
   double     offGG = 0.0;
 

trunk/BNC/src/PPP/pppEphPool.cpp

@@ -133 +133 @@
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
-    t_irc irc = eph->getCrd(tt, xc, vv, OPT->corrRequired());
+    t_irc irc = eph->getCrd(tt, xc, vv, OPT->useOrbClkCorr());
     if (irc == success) {
       if (eph->prn().system() == 'R') {

trunk/BNC/src/PPP/pppParlist.cpp

@@ -74 +74 @@
    case crdX:
      _epoSpec = true;
-     _sigma0  = OPT->_sigCrd[0];
+     _sigma0  = OPT->_aprSigCrd[0];
      break;
    case crdY:
      _epoSpec = true;
-     _sigma0  = OPT->_sigCrd[1];
+     _sigma0  = OPT->_aprSigCrd[1];
      break;
    case crdZ:
      _epoSpec = true;
-     _sigma0  = OPT->_sigCrd[2];
+     _sigma0  = OPT->_aprSigCrd[2];
      break;
    case clkR:
@@ -106 +106 @@
      _sigma0  = 100.0;
      break;
-   case offGG:
-     _epoSpec = true;
-     _sigma0  = 1000.0;
-     _x0      = PPP_CLIENT->offGG();
-     break;
    case trp:
      _epoSpec = false;
-     _sigma0  = OPT->_sigTropo;
-     _noise   = OPT->_noiseTropo;
-     break;
-   case bias:
-     _epoSpec = true;
-     _sigma0  = 10.0;
+     _sigma0  = OPT->_aprSigTrp;
+     _noise   = OPT->_noiseTrp;
      break;
   }
@@ -136 +127 @@
   // Special Case - Melbourne-Wuebbena
   // ---------------------------------
-  if (tLC == t_lc::MW && _type != amb && _type != bias) {
+  if (tLC == t_lc::MW && _type != amb) {
     return 0.0;
   }
@@ -152 +143 @@
   case clkR:
     return 1.0;
-  case offGG:
-    return (obs->prn().system() == 'R') ? 1.0 : 0.0;
   case amb:
     if (obs->prn() == _prn) {
@@ -176 +165 @@
   case trp:
     return 1.0 / sin(obs->eleSat()); 
-  case bias:
-    if (tLC == _tLC && obs->prn().system() == _prn.system()) {
-      return 1.0;
-    }
-    else {
-      return 0.0;
-    }
   }
 
@@ -208 +190 @@
     ss << "AMB " << left << setw(3) << t_lc::toString(_tLC) << right << ' ' << _prn.toString();
     break;
-  case offGG:
-    ss << "OGG        ";
-    break;
   case trp:
     ss << "TRP        ";
-    break;
-  case bias:
-    ss << "BIAS " << _prn.system() << ' ' << left << setw(3) << t_lc::toString(_tLC);
     break;
   }
@@ -310 +286 @@
   required.push_back(new t_pppParam(t_pppParam::clkR, t_prn(), t_lc::dummy));
 
-  // GPS-Glonass Clock Offset
-  // ------------------------
-  if (OPT->useGlonass()) {
-    required.push_back(new t_pppParam(t_pppParam::offGG, t_prn(), t_lc::dummy));
-  }
-
-  // Receiver Biases
-  // ---------------
-  for (unsigned ii = 0; ii < OPT->_estBias.size(); ii++) {
-    const t_pppOptions::t_optBias& optBias = OPT->_estBias[ii];
-    required.push_back(new t_pppParam(t_pppParam::bias, t_prn(optBias._system, 1), optBias._tLC));
-  }
-
   // Troposphere
   // -----------
-  if (OPT->estTropo()) {
+  if (OPT->estTrp()) {
     required.push_back(new t_pppParam(t_pppParam::trp, t_prn(), t_lc::dummy));
   }

trunk/BNC/src/PPP/pppParlist.h

@@ -14 +14 @@
 class t_pppParam {
  public:
-  enum e_type {crdX, crdY, crdZ, clkR, amb, offGG, trp, bias};
+  enum e_type {crdX, crdY, crdZ, clkR, amb, trp};
 
   t_pppParam(e_type type, const t_prn& prn, t_lc::type tLC,