Changeset 2408 in ntrip

Timestamp:

Apr 9, 2010, 11:25:40 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk

Files:

• BNC/bncpppclient.cpp (modified) (1 diff)
• BNS/bns.cpp (modified) (1 diff)

trunk/BNC/bncpppclient.cpp

@@ -440 +440 @@
   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;
-
-  // Relativistic Correction
-  // -----------------------
-  xc[3] -= 2.0 * DotProduct(xc.Rows(1,3),vv) / t_CST::c / t_CST::c ;
+  xc[0] += dx[0];
+  xc[1] += dx[1];
+  xc[2] += dx[2];
+  xc[3] += cc->dClk + cc->dotDClk * dt + cc->dotDotDClk * dt * dt;
 }
 

trunk/BNS/bns.cpp

@@ -595 +595 @@
     }
     
-    ColumnVector dx = xB.Rows(1,3) - xyz;
+    ColumnVector dx = xyz - xB.Rows(1,3);
     
     if (ii == 1) {
       XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
-      dClk = (xB(4) - xx(4)) * 299792458.0;
+      dClk = (xx(4) + xx(5) - xB(4)) * 299792458.0;
     }
     else {