Changeset 7013 in ntrip

Timestamp:

Jul 5, 2015, 7:34:51 PM (9 years ago)

Author:

stuerze

Message:

some unit changes regarding ssr clock parameter s

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (1 diff)
• combination/bnccomb.cpp (modified) (2 diffs)
• satObs.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -307 +307 @@
       clkCorr._time       = _lastTime;
       clkCorr._updateInt  = _clkOrb.UpdateInterval;
-      clkCorr._dClk       = _clkOrb.Sat[ii].Clock.DeltaA0 / t_CST::c;
-      clkCorr._dotDClk    = _clkOrb.Sat[ii].Clock.DeltaA1 / t_CST::c;
-      clkCorr._dotDotDClk = _clkOrb.Sat[ii].Clock.DeltaA2 / t_CST::c;
+      clkCorr._dClk       = _clkOrb.Sat[ii].Clock.DeltaA0;
+      clkCorr._dotDClk    = _clkOrb.Sat[ii].Clock.DeltaA1;
+      clkCorr._dotDotDClk = _clkOrb.Sat[ii].Clock.DeltaA2;
 
       _lastClkCorrections[clkCorr._prn] = clkCorr;

trunk/BNC/src/combination/bnccomb.cpp

@@ -712 +712 @@
     cmbCorr* corr = it.value();
 
+    t_orbCorr orbCorr(corr->_orbCorr);
+    orbCorr._staID = "INTERNAL";
+    orbCorrections.push_back(orbCorr);
+
+    t_clkCorr clkCorr(corr->_clkCorr);
+    clkCorr._staID      = "INTERNAL";
+    clkCorr._dClk       = corr->_dClkResult;
+    clkCorr._dotDClk    = 0.0;
+    clkCorr._dotDotDClk = 0.0;
+    clkCorrections.push_back(clkCorr);
+
     ColumnVector xc(4);
     ColumnVector vv(3);
-    t_orbCorr orbCorr2Use(corr->_orbCorr);
-    t_clkCorr clkCorr2Use(corr->_clkCorr);
-    clkCorr2Use._dClk       = corr->_dClkResult *  t_CST::c;
-    clkCorr2Use._dotDClk    = 0.0;
-    clkCorr2Use._dotDotDClk = 0.0;
-
-    corr->_eph->setClkCorr(dynamic_cast<const t_clkCorr*>(&clkCorr2Use));
-    corr->_eph->setOrbCorr(dynamic_cast<const t_orbCorr*>(&orbCorr2Use));
+    corr->_eph->setClkCorr(dynamic_cast<const t_clkCorr*>(&clkCorr));
+    corr->_eph->setOrbCorr(dynamic_cast<const t_orbCorr*>(&orbCorr));
     corr->_eph->getCrd(_resTime, xc, vv, true);
 
@@ -769 +774 @@
     corrLines << line;
 
-    t_orbCorr orbCorr(corr->_orbCorr);
-    orbCorr._staID = "INTERNAL";
-    orbCorrections.push_back(orbCorr);
-
-    t_clkCorr clkCorr(corr->_clkCorr);
-    clkCorr._staID      = "INTERNAL";
-    clkCorr._dClk       = corr->_dClkResult;
-    clkCorr._dotDClk    = 0.0;
-    clkCorr._dotDotDClk = 0.0;
-    clkCorrections.push_back(clkCorr);
-
     delete corr;
   }

trunk/BNC/src/satObs.cpp

@@ -67 +67 @@
       corr._prn.setFlags(1);// I/NAV
     }
-
-    corr._dClk       /= t_CST::c;
-    corr._dotDClk    /= t_CST::c;
-    corr._dotDotDClk /= t_CST::c;
-
     corrList.push_back(corr);
   }