Changeset 3392 in ntrip

Timestamp:

Aug 31, 2011, 11:36:58 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (5 diffs)
• bncpppclient.h (modified) (2 diffs)

trunk/BNC/bncmodel.cpp

@@ -56 +56 @@
 using namespace std;
 
-const unsigned MINOBS       =    5;
-const double   MINELE       = 10.0 * M_PI / 180.0;
-const double   MAXRES_CODE  = 10.0;
-const double   MAXRES_PHASE = 0.04;
+const unsigned MINOBS                = 5;
+const double   MINELE                = 10.0 * M_PI / 180.0;
+const double   MAXRES_CODE           = 10.0;
+const double   MAXRES_PHASE          = 0.04;
+const double   GLONASS_WEIGHT_FACTOR = 10.0;
 
 // Constructor
@@ -1118 +1119 @@
   // --------------------------
   ++iObs;
-  satData->index = iObs;
+  satData->obsIndex = iObs;
 
   // Phase Observations
@@ -1124 +1125 @@
   if (iPhase == 1) {
     ll(iObs)      = satData->L3 - cmpValue(satData, true);
-    PP(iObs,iObs) = 1.0 / (_sigL3 * _sigL3) / (ellWgtCoef * ellWgtCoef);
+    double sigL3 = _sigL3;
     if (satData->system() == 'R') {
-      ////      PP(iObs,iObs) /= 25.0;
-      PP(iObs,iObs) /= 9.0;
-    }
+      sigL3 /= GLONASS_WEIGHT_FACTOR;
+    }
+    PP(iObs,iObs) = 1.0 / (sigL3 * sigL3) / (ellWgtCoef * ellWgtCoef);
     for (int iPar = 1; iPar <= _params.size(); iPar++) {
       if (_params[iPar-1]->type == bncParam::AMB_L3 &&
@@ -1155 +1156 @@
   Tracer tracer("bncModel::printRes");
 
-  if (satData->index != 0) {
+  if (satData->obsIndex != 0) {
     str << _time.timestr(1)
         << " RES " << satData->prn.toAscii().data() 
         << (iPhase ? "   L3 " : "   P3 ")
-        << setw(9) << setprecision(4) << vv(satData->index) << endl;
+        << setw(9) << setprecision(4) << vv(satData->obsIndex) << endl;
   }
 }
@@ -1177 +1178 @@
     it.next();
     t_satData* satData = it.value();
-    if (satData->index != 0 && fabs(vv(satData->index)) > maxRes) {
-      maxRes = fabs(vv(satData->index));
+    if (satData->obsIndex != 0 && fabs(vv(satData->obsIndex)) > maxRes) {
+      maxRes = fabs(vv(satData->obsIndex));
       prn    = satData->prn;
     }

trunk/BNC/bncpppclient.h

@@ -35 +35 @@
  public:
   t_satData() {
-    index = 0;
+    obsIndex = 0;
   }
   ~t_satData() {}
@@ -56 +56 @@
   bool         slipFlag;
   double       lambda3;
-  unsigned     index;
+  unsigned     obsIndex;
   char system() const {return prn.toAscii()[0];}
 };