Changeset 6254 in ntrip for trunk/BNC

Timestamp:

Oct 23, 2014, 10:16:27 AM (10 years ago)

Author:

stuerze

Message:

modeled zenith tropo delay added in ppp logfile output

File:

• trunk/BNC/src/PPP/pppParlist.cpp (modified) (15 diffs)

trunk/BNC/src/PPP/pppParlist.cpp

@@ -11 +11 @@
  * Created:    29-Jul-2014
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -103 +103 @@
 }
 
-// 
-////////////////////////////////////////////////////////////////////////////
-double t_pppParam::partial(const bncTime& /* epoTime */, const t_pppSatObs* obs, 
+//
+////////////////////////////////////////////////////////////////////////////
+double t_pppParam::partial(const bncTime& /* epoTime */, const t_pppSatObs* obs,
                         const t_lc::type& tLC) const {
 
@@ -141 +141 @@
         obs->lcCoeff(tLC, codeCoeff, phaseCoeff);
         if      (_tLC == t_lc::l1) {
-          return obs->lambda(t_lc::l1) * phaseCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l1)]; 
+          return obs->lambda(t_lc::l1) * phaseCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l1)];
         }
         else if (_tLC == t_lc::l2) {
-          return obs->lambda(t_lc::l2) * phaseCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l2)]; 
+          return obs->lambda(t_lc::l2) * phaseCoeff[t_lc::toFreq(obs->prn().system(),t_lc::l2)];
         }
       }
@@ -150 +150 @@
     return 0.0;
   case trp:
-    return 1.0 / sin(obs->eleSat()); 
+    return 1.0 / sin(obs->eleSat());
   }
 
@@ -156 +156 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 string t_pppParam::toString() const {
@@ -163 +163 @@
   case crdX:
     ss << "CRD_X";
-    break; 
+    break;
   case crdY:
     ss << "CRD_Y";
@@ -199 +199 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 t_irc t_pppParlist::set(const bncTime& epoTime, const std::vector<t_pppSatObs*>& obsVector) {
@@ -211 +211 @@
     bool remove = false;
 
-    if      (par->epoSpec()) {  
+    if      (par->epoSpec()) {
       remove = true;
     }
@@ -258 +258 @@
       }
     }
-  } 
+  }
 
   // Required Set of Parameters
@@ -336 +336 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppParlist::printResult(const bncTime& epoTime, const SymmetricMatrix& QQ,
@@ -342 +342 @@
 
   string epoTimeStr = string(epoTime);
+  const t_pppStation* sta = PPP_CLIENT->staRover();
 
   LOG << endl;
@@ -361 +362 @@
     else {
       int ind = par->indexNew();
+      double apr = (par->type() == t_pppParam::trp) ?
+        t_tropo::delay_saast(sta->xyzApr(), M_PI/2.0) :  par->x0();
       LOG << epoTimeStr << ' ' << par->toString() << ' '
-          << setw(10) << setprecision(4) << par->x0() << ' '
+          << setw(10) << setprecision(4) << apr << ' '
           << showpos << setw(10) << setprecision(4) << xx[ind] << noshowpos << " +- "
           << setw(8)  << setprecision(4) << sqrt(QQ[ind][ind]);
@@ -372 +375 @@
     }
   }
-  
+
   if (parX && parY && parZ) {
-    const t_pppStation* sta = PPP_CLIENT->staRover();
-
-    ColumnVector xyz(3);
+
+        ColumnVector xyz(3);
     xyz[0] = xx[parX->indexNew()];
     xyz[1] = xx[parY->indexNew()];
@@ -392 +394 @@
         << " X = " << setprecision(4) << sta->xyzApr()[0] + xyz[0] << " +- "
         << setprecision(4) << sqrt(QQxyz[0][0])
-                                   
+
         << " Y = " << setprecision(4) << sta->xyzApr()[1] + xyz[1] << " +- "
         << setprecision(4) << sqrt(QQxyz[1][1])
@@ -407 +409 @@
         << " dU = " << setprecision(4) << neu[2] << " +- "
         << setprecision(4) << sqrt(QQneu[2][2])
- 
+
         << endl;
   }