Changeset 9821 in ntrip for trunk/BNC/src/combination

Timestamp:

Sep 9, 2022, 10:57:27 AM (3 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/combination

Files:

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

trunk/BNC/src/combination/bnccomb.cpp

@@ -174 +174 @@
       QStringList hlp = it.next().split(" ");
       cmbAC* newAC = new cmbAC();
-      newAC->mountPoint = hlp[0];
-      newAC->name       = hlp[1];
-      newAC->weight     = hlp[2].toDouble();
+      newAC->mountPoint   = hlp[0];
+      newAC->name         = hlp[1];
+      newAC->weightFactor = hlp[2].toDouble();
       QMapIterator<char, unsigned> itSys(_cmbSysPrn);
       // init
@@ -456 +456 @@
     // ----------------------
     QString acName;
+    double weigthFactor;
     QListIterator<cmbAC*> icAC(_ACs);
     while (icAC.hasNext()) {
@@ -461 +462 @@
       if (AC->mountPoint == staID) {
         acName = AC->name;
+        weigthFactor = AC->weightFactor;
         break;
       }
@@ -492 +494 @@
     newCorr->_acName  = acName;
     newCorr->_clkCorr = clkCorr;
+    newCorr->_weightFactor = weigthFactor;
 
     // Check orbit correction
@@ -1033 +1036 @@
     ll(iObs) = (corr->_clkCorr._dClk * t_CST::c - corr->_satCodeBiasIF) - DotProduct(AA.Row(iObs), x0);
 
+    PP(iObs, iObs) *= 1.0 / (corr->_weightFactor * corr->_weightFactor);
   }
 

trunk/BNC/src/combination/bnccomb.h

@@ -65 +65 @@
    public:
     cmbAC() {
-      weight = 0.0;
-      numObs['G'] = 0;
-      numObs['R'] = 0;
-      numObs['E'] = 0;
-      numObs['C'] = 0;
-      numObs['J'] = 0;
-      numObs['S'] = 0;
-      numObs['I'] = 0;
+      weightFactor = 1.0;
+      numObs['G']  = 0;
+      numObs['R']  = 0;
+      numObs['E']  = 0;
+      numObs['C']  = 0;
+      numObs['J']  = 0;
+      numObs['S']  = 0;
+      numObs['I']  = 0;
     }
     ~cmbAC() {}
     QString  mountPoint;
     QString  name;
-    double   weight;
+    double   weightFactor;
     QMap<char, unsigned> numObs;
   };
@@ -101 +101 @@
     double         _dClkResult;
     ColumnVector   _diffRao;
+    double         _weightFactor;
     QString ID() {return _acName + "_" + _prn;}
   };