Changeset 4403 in ntrip for trunk/BNC/src/rinex

Timestamp:

Jul 8, 2012, 11:35:48 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• bncpostprocess.cpp (modified) (1 diff)
• reqcanalyze.cpp (modified) (3 diffs)

trunk/BNC/src/rinex/bncpostprocess.cpp ¶

@@ -119 +119 @@
   for (int iType = 0; iType < rnxObsFile->nTypes(obs.satSys); iType++) {
     QString type = rnxObsFile->obsType(obs.satSys,iType).toAscii();
-    obs.setMeasdata(type, rnxSat.obs[iType]);
+    obs.setMeasdata(type, rnxObsFile->version(), rnxSat.obs[iType]);
     // TOOD: handle slip flags
   }

trunk/BNC/src/rinex/reqcanalyze.cpp ¶

@@ -237 +237 @@
   // Compute the Multipath
   // ----------------------
-  double L1 = obs.measdata("L1");
-  double L2 = obs.measdata("L2");
+  double L1 = obs.measdata("L1", 2.0);
+  double L2 = obs.measdata("L2", 2.0);
   if (L1 != 0.0 && L2 != 0.0) {
     double f1 = t_CST::f1(obs.satSys, obs.slotNum);
@@ -246 +246 @@
     L2 = L2 * t_CST::c / f2;
 
-    double P1 = obs.measdata("P1");
+    double P1 = obs.measdata("P1", 2.0);
     if (P1 != 0.0) {
       newObs->_MP1 = P1 - L1 - 2.0*f2*f2/(f1*f1-f2*f2) * (L1 - L2);
@@ -258 +258 @@
       //// end test
     }
-    double P2 = obs.measdata("P2");
+    double P2 = obs.measdata("P2", 2.0);
     if (P2 != 0.0) {
       newObs->_MP2 = P2 - L2 - 2.0*f1*f1/(f1*f1-f2*f2) * (L1 - L2);