Changeset 3519 in ntrip

Timestamp:

Dec 13, 2011, 5:36:45 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncpppclient.cpp (modified) (3 diffs)
• bncpppclient.h (modified) (1 diff)
• combination/bnccomb.cpp (modified) (1 diff)

trunk/BNC/bncpppclient.cpp

@@ -376 +376 @@
           if      (eLast && eLast->IOD() == cc->iod) {
             eLast->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
-            return applyCorr(tt, cc, xc, vv);
+            return applyCorr(tt, cc, xc, vv, eLast);
           }
           else if (ePrev && ePrev->IOD() == cc->iod) {
             ePrev->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
-            return applyCorr(tt, cc, xc, vv);
+            return applyCorr(tt, cc, xc, vv, ePrev);
           }
         }
@@ -399 +399 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc bncPPPclient::applyCorr(const bncTime& tt, const t_corr* cc, 
-                             ColumnVector& xc, ColumnVector& vv) {
-  ColumnVector dx(3);
+                              ColumnVector& xc, ColumnVector& vv,
+                              const t_eph* eph) {
 
   double dt = tt - cc->tt;
@@ -410 +410 @@
 
   if (cc->xyzCorr) {
-    dx = raoHlp;
+    xc[0] += raoHlp[0];
+    xc[1] += raoHlp[1];
+    xc[2] += raoHlp[2];
+    ColumnVector xcHlp(4);
+    ColumnVector vvHlp(3);
+    eph->position(cc->tt.gpsw(), cc->tt.gpssec(), xcHlp.data(), vvHlp.data());
+    xc[3] += cc->dClk - xcHlp[3];
   }
   else {
+    ColumnVector dx(3);
     RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
-  }
-
-  xc[0] -= dx[0];
-  xc[1] -= dx[1];
-  xc[2] -= dx[2];
-  xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt
-        + cc->hrClk;
+    xc[0] -= dx[0];
+    xc[1] -= dx[1];
+    xc[2] -= dx[2];
+    xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt
+          + cc->hrClk;
+  }
 
   return success;

trunk/BNC/bncpppclient.h

@@ -125 +125 @@
   void putNewObs(const t_obs& pp);
   static t_irc applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, 
-                         ColumnVector& vv);
+                         ColumnVector& vv, const t_eph* eph);
 
  public slots:

trunk/BNC/combination/bnccomb.cpp

@@ -658 +658 @@
       corr->eph->position(time12.gpsw(), time12.gpssec(), 
                           xc.data(), vv.data());
-      bncPPPclient::applyCorr(time12, corr, xc, vv);
+      bncPPPclient::applyCorr(time12, corr, xc, vv, corr->eph);
       
       // Relativistic Correction