Changeset 9685 in ntrip for trunk

Timestamp:

Apr 11, 2022, 2:52:54 PM (3 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• combination/bncbiassnx.cpp (modified) (1 diff)
• satObs.cpp (modified) (4 diffs)

trunk/BNC/src/combination/bncbiassnx.cpp

@@ -149 +149 @@
       if (unit.contains("ns")) {
         // from nano seconds into meters
+        value /= 1.e9;
         value *= t_CST::c;
-        value /= 1.e9;
+
       }
 

trunk/BNC/src/satObs.cpp

@@ -37 +37 @@
     *out << corr._prn.toString() << ' ' << setw(11) << corr._iod << ' '
          << setw(10) << setprecision(4) << corr._dClk       * t_CST::c      << ' '
-         << setw(10) << setprecision(4) << corr._dotDClk    * t_CST::c *1.e3 << ' '    // m/s => mm/s
-         << setw(10) << setprecision(4) << corr._dotDotDClk * t_CST::c *1.e3 << endl;  // m/s => mm/s
+         << setw(10) << setprecision(4) << corr._dotDClk    * t_CST::c * 1.e3 << ' '    // m/s => mm/s
+         << setw(10) << setprecision(4) << corr._dotDotDClk * t_CST::c * 1.e3 << endl;  // m/s => mm/s
   }
   out->flush();
@@ -67 +67 @@
       corr._prn.setFlags(1);// I/NAV
     }
-    corr._dClk       /= t_CST::c;
-    corr._dotDClk    /= t_CST::c;
-    corr._dotDotDClk /= t_CST::c;
-
-    corr._dotDClk    /= 1.e3;  // mm/s => m/s
-    corr._dotDotDClk /= 1.e3;  // mm/s => m/s
+    corr._dClk       /= (t_CST::c);       // m
+    corr._dotDClk    /= (t_CST::c * 1.e3);// mm/s
+    corr._dotDotDClk /= (t_CST::c * 1.e3);// mm/s²
 
     corrList.push_back(corr);
@@ -109 +106 @@
          << setw(10) << setprecision(4) << corr._xr[1]     << ' '
          << setw(10) << setprecision(4) << corr._xr[2]     << "    "
-         << setw(10) << setprecision(4) << corr._dotXr[0] * 1.e3  << ' '   // m/s => mm/s
-         << setw(10) << setprecision(4) << corr._dotXr[1] * 1.e3  << ' '   // m/s => mm/s
-         << setw(10) << setprecision(4) << corr._dotXr[2] * 1.e3 << endl;  // m/s => mm/s
+         << setw(10) << setprecision(4) << corr._dotXr[0] * 1.e3 << ' '   // m/s => mm/s
+         << setw(10) << setprecision(4) << corr._dotXr[1] * 1.e3 << ' '   // m/s => mm/s
+         << setw(10) << setprecision(4) << corr._dotXr[2] * 1.e3 << endl; // m/s => mm/s
   }
   out->flush();
@@ -140 +137 @@
        >> corr._dotXr[0] >> corr._dotXr[1] >> corr._dotXr[2];
 
-    corr._dotXr /= 1.e3; // mm/s => m/s
+    corr._dotXr[0] /= 1.e3; // mm/s => m/s
+    corr._dotXr[1] /= 1.e3; // mm/s => m/s
+    corr._dotXr[2] /= 1.e3; // mm/s => m/s
 
     if (corr._prn.system() == 'E') {