Changeset 3450 in ntrip for trunk/BNC

Timestamp:

Sep 22, 2011, 5:17:39 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (6 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/combination/bnccomb.cpp

@@ -30 +30 @@
 #include "bnctides.h"
 
-const int moduloTime = 10;
-
-const double sig0_offAC    = 1000.0;
-const double sig0_offACSat =  100.0;
-const double sigP_offACSat =    0.0;
-const double sig0_clkSat   =  100.0;
+using namespace std;
 
 const int MAXPRN_GPS = 32;
-
-using namespace std;
 
 // Constructor
@@ -53 +46 @@
 
   if      (type == offAC) {
-    epoSpec = true;
-    sig0    = sig0_offAC;
-    sigP    = sig0;
+    sig_0 = 1000.0;
+    sig_P = 1000.0;
   }
   else if (type == offACSat) {
-    epoSpec = false;
-    sig0    = sig0_offACSat;
-    sigP    = sigP_offACSat;
+    sig_0 = 100.0;
+    sig_P =   0.0;
   }
   else if (type == clkSat) {
-    epoSpec = true;
-    sig0    = sig0_clkSat;
-    sigP    = sig0;
+    sig_0 = 100.0;
+    sig_P = 100.0;
   }
 }
@@ -166 +156 @@
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
     cmbParam* pp = _params[iPar-1];
-    _QQ(iPar,iPar) = pp->sig0 * pp->sig0;
+    _QQ(iPar,iPar) = pp->sig_0 * pp->sig_0;
   }
 
@@ -243 +233 @@
   // Check Modulo Time
   // -----------------
+  const int moduloTime = 10;
   if (int(newCorr->tt.gpssec()) % moduloTime != 0.0) {
     delete newCorr;
@@ -389 +380 @@
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
     cmbParam* pp = _params[iPar-1];
-    if (pp->epoSpec) {
-      pp->xx = 0.0;
-      _QQ.Row(iPar)    = 0.0;
-      _QQ.Column(iPar) = 0.0;
-      _QQ(iPar,iPar) = pp->sig0 * pp->sig0;
-    }
-    else {
-      _QQ(iPar,iPar) += pp->sigP * pp->sigP;
-    }
+    _QQ(iPar,iPar) += pp->sig_P * pp->sig_P;
     x0(iPar) = pp->xx;
   }
@@ -486 +469 @@
           QQ_sav.Row(iPar)    = 0.0;
           QQ_sav.Column(iPar) = 0.0;
-          QQ_sav(iPar,iPar)   = pp->sig0 * pp->sig0;
+          QQ_sav(iPar,iPar)   = pp->sig_0 * pp->sig_0;
         }
       }

trunk/BNC/combination/bnccomb.h

@@ -23 +23 @@
   QString prn;
   double  xx;
-  double  sig0;
-  double  sigP;
-  bool    epoSpec;
+  double  sig_0;
+  double  sig_P;
 };