Changeset 4607 in ntrip

Timestamp:

Aug 31, 2012, 10:40:39 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (5 diffs)
• reqcanalyze.h (modified) (2 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -388 +388 @@
     bncTime prevTime;
     bncTime chunkStartTime;
-    bool    availL1  = false;
-    bool    availL2  = false;
-    bool    gapL1    = false;
-    bool    gapL2    = false;
-    bool    slipFlag = false;
-    double  meanMP1  = 0.0;
-    double  meanMP2  = 0.0;
-    double  minSNR1  = 0.0;
-    double  minSNR2  = 0.0;
-    double  aziDeg   = 0.0;
-    double  zenDeg   = 0.0;
+    bool    availL1 = false;
+    bool    availL2 = false;
+    bool    gapL1   = false;
+    bool    gapL2   = false;
+    bool    slipL1  = false;
+    bool    slipL2  = false;
+    bool    slipMP  = false;
+    double  meanMP1 = 0.0;
+    double  meanMP2 = 0.0;
+    double  minSNR1 = 0.0;
+    double  minSNR2 = 0.0;
+    double  aziDeg  = 0.0;
+    double  zenDeg  = 0.0;
 
     // Loop over all Epochs within one Chunk of Data
@@ -471 +473 @@
       }
 
-      // Check Slip
-      // ----------
+      // Check Slip Flags
+      // ----------------
+      if (oneObs->_slipL1) {
+        slipL1 = true;
+      }
+      if (oneObs->_slipL2) {
+        slipL2 = true;
+      }
+
+      // Check Slip Threshold
+      // --------------------
       if (ii > 0) {
         double diff1 = oneObs->_MP1 - allObs._oneObsVec[iEpo-1]->_MP1;
         double diff2 = oneObs->_MP2 - allObs._oneObsVec[iEpo-1]->_MP2;
         if (fabs(diff1) > SLIPTRESH || fabs(diff2) > SLIPTRESH) {
-          slipFlag = true;
+          slipMP = true;
         }
       }
@@ -489 +500 @@
     double mjd = chunkStartTime.mjddec();
     if (availL1) {
-      if      (slipFlag) {
+      if      (slipL1) {
         _availDataMap[prn]._L1slip << mjd;
       }
@@ -500 +511 @@
     }
     if (availL2) {
-      if      (slipFlag) {
+      if      (slipL2) {
         _availDataMap[prn]._L2slip << mjd;
       }
@@ -518 +529 @@
     // Compute the Multipath
     // ---------------------
-    if (!slipFlag) {
+    if (!slipMP) {
       meanMP1 /= numEpo;
       meanMP2 /= numEpo;

trunk/BNC/src/rinex/reqcanalyze.h

@@ -85 +85 @@
       _hasL1    = false;
       _hasL2    = false;
+      _slipL1   = false;
+      _slipL2   = false;
       _MP1      = 0.0;
       _MP2      = 0.0;
@@ -94 +96 @@
     bool   _hasL1;
     bool   _hasL2;
+    bool   _slipL1;
+    bool   _slipL2;
     double _MP1;
     double _MP2;