Changeset 6109 in ntrip for trunk/BNC/src/combination/bnccomb.cpp

Timestamp:

Sep 8, 2014, 3:49:16 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (4 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -412 +412 @@
   ColumnVector oldXC(4);
   ColumnVector oldVV(3);
-  corr->eph->position(corr->tRao.gpsw(), corr->tRao.gpssec(), 
-                      oldXC.data(), oldVV.data());
+  corr->eph->getCrd(corr->tRao, oldXC, oldVV, false);
 
   ColumnVector newXC(4);
   ColumnVector newVV(3);
-  lastEph->position(corr->tRao.gpsw(), corr->tRao.gpssec(), 
-                    newXC.data(), newVV.data());
+  lastEph->getCrd(corr->tRao, newXC, newVV, false);
 
   ColumnVector dX = newXC.Rows(1,3) - oldXC.Rows(1,3);
@@ -640 +638 @@
     const t_eph* eph = corr->eph;
     if (eph) {
-      double xx, yy, zz, cc;
-      eph->position(_resTime.gpsw(), _resTime.gpssec(), xx, yy, zz, cc);
+      ColumnVector xc(4);
+      ColumnVector vv(3);
+      eph->getCrd(_resTime, xc, vv, false);
 
       out << _resTime.datestr().c_str() << " " 
@@ -648 +647 @@
       out << "Full Clock " << corr->prn << " " << corr->iod << " ";
       out.setFieldWidth(14);
-      out << (cc + corr->dClk) * t_CST::c << endl;
+      out << (xc(4) + corr->dClk) * t_CST::c << endl;
       out.setFieldWidth(0);
     }
@@ -679 +678 @@
     ColumnVector xc(4);
     ColumnVector vv(3);
-    corr->eph->position(_resTime.gpsw(), _resTime.gpssec(), 
-                        xc.data(), vv.data());
+    corr->eph->getCrd(_resTime, xc, vv, false);
     
     // Correction Phase Center --> CoM