Changeset 1733 in ntrip

Timestamp:

Mar 6, 2009, 9:33:54 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (5 diffs)
• bns.h (modified) (1 diff)

trunk/BNS/bns.cpp

@@ -396 +396 @@
           }
       
-          // Clocks without corrections 
-          // --------------------------
-          if ( _caster.at(ic)->beClocks() ) {
-            xx(4) -= xx(5) / 299792458.0;
-            xx(5) = 0.0;
-          } 
-
           if (ep != 0) {
             struct ClockOrbit::SatData* sd = 0;
@@ -415 +408 @@
             if (sd) {
               QString outLine;
-              processSatellite(oldEph, ic, _caster.at(ic)->crdTrafo(), ep, 
+              processSatellite(oldEph, ic, _caster.at(ic)->crdTrafo(), 
+                               _caster.at(ic)->beClocks(), ep, 
                                GPSweek, GPSweeks, prn, xx, sd, outLine);
               _caster.at(ic)->printAscii(outLine);
@@ -439 +433 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_bns::processSatellite(int oldEph, int iCaster, bool trafo, t_eph* ep, 
-                             int GPSweek, double GPSweeks, const QString& prn, 
+void t_bns::processSatellite(int oldEph, int iCaster, bool trafo, 
+                             bool beClocks, t_eph* ep, int GPSweek, 
+                             double GPSweeks, const QString& prn, 
                              const ColumnVector& xx, 
                              struct ClockOrbit::SatData* sd,
@@ -455 +450 @@
   }
 
-  ColumnVector dx   = xyz - xB.Rows(1,3);
-
-  double       dClk = (xx(4) - xB(4)) * 299792458.0; 
+  ColumnVector dx = xyz - xB.Rows(1,3);
+
   ColumnVector rsw(3);
-
   XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
+
+  double dClk;
+  if (beClocks) {
+    dClk = (xx(4) - xB(4)) * 299792458.0 - xx(5);
+  }
+  else {
+    dClk = (xx(4) - xB(4)) * 299792458.0;
+  }
 
   if (sd) {
@@ -526 +527 @@
   rMat(3,3) = 1.0;
 
-
   xyz = sc * rMat * xyz + dx;
 }

trunk/BNS/bns.h

@@ -60 +60 @@
   void openCaster();
   void readEpoch();
-  void processSatellite(int oldEph, int iCaster, bool trafo, t_eph* ep, 
-                        int GPSweek, double GPSweeks, const QString& prn, 
-                        const ColumnVector& xx, struct ClockOrbit::SatData* sd,
-                        QString& outLine);
+  void processSatellite(int oldEph, int iCaster, bool trafo, bool beClocks,
+                        t_eph* ep, int GPSweek, double GPSweeks, 
+                        const QString& prn, const ColumnVector& xx, 
+                        struct ClockOrbit::SatData* sd, QString& outLine);
   void crdTrafo(int GPSWeek, ColumnVector& xyz);