Changeset 2934 in ntrip

Timestamp:

Jan 29, 2011, 8:08:19 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -46 +46 @@
 double cmbParam::partial(const QString& acIn, t_corr* corr) {
   
-  if      (type == offset) {
+  if      (type == AC_offset) {
+    if (AC == acIn) {
+      return 1.0;
+    }
+  }
+  else if (type == Sat_offset) {
     if (AC == acIn && prn == corr->prn) {
       return 1.0;
@@ -99 +104 @@
       it.next();
       cmbAC* AC = it.value();
-      _params.push_back(new cmbParam(cmbParam::offset, ++nextPar, AC->name,prn));
+      if (iGps == 1) {
+        _params.push_back(new cmbParam(cmbParam::AC_offset, ++nextPar, AC->name, ""));
+      }
+      _params.push_back(new cmbParam(cmbParam::Sat_offset, ++nextPar, AC->name, prn));
     }
   }
@@ -107 +115 @@
   _QQ = 0.0;
 
-  _sigClk0 = 100.0;
-  _sigOff0 = 100.0;
+  _sigACOff  = 100.0;
+  _sigSatOff = 100.0;
+  _sigClk    = 100.0;
 
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
     cmbParam* pp = _params[iPar-1];
-    if      (pp->type == cmbParam::clk) {
-      _QQ(iPar,iPar) = _sigClk0 * _sigClk0; 
-    }
-    else if (pp->type == cmbParam::offset) {
-      _QQ(iPar,iPar) = _sigOff0 * _sigOff0; 
+    if      (pp->type == cmbParam::AC_offset) {
+      _QQ(iPar,iPar) = _sigACOff * _sigACOff; 
+    }
+    else if (pp->type == cmbParam::Sat_offset) {
+      _QQ(iPar,iPar) = _sigSatOff * _sigSatOff; 
+    }
+    else if (pp->type == cmbParam::clk) {
+      _QQ(iPar,iPar) = _sigClk * _sigClk; 
     }
   }
@@ -314 +326 @@
   for (int iPar = 1; iPar <= _params.size(); iPar++) {
     cmbParam* pp = _params[iPar-1];
-    if      (pp->type == cmbParam::clk) {
+    if  (pp->type == cmbParam::AC_offset || pp->type == cmbParam::clk) {
       pp->xx = 0.0;
       for (int jj = 1; jj <= _params.size(); jj++) {
         _QQ(iPar, jj) = 0.0;
       }
-     _QQ(iPar,iPar) = _sigClk0 * _sigClk0;
+    }
+    if      (pp->type == cmbParam::AC_offset) {
+     _QQ(iPar,iPar) = _sigACOff * _sigACOff;
+    }
+    else if (pp->type == cmbParam::clk) {
+     _QQ(iPar,iPar) = _sigClk * _sigClk;
     }
   }

trunk/BNC/combination/bnccomb.h

@@ -10 +10 @@
 class cmbParam {
  public:
-  enum parType {offset, clk};
+  enum parType {AC_offset, Sat_offset, clk};
   cmbParam(parType typeIn, int indexIn, 
            const QString& acIn, const QString& prnIn);
@@ -79 +79 @@
   cmbCaster*            _caster;
   QVector<cmbParam*>    _params;
-  double                _sigClk0;
-  double                _sigOff0;
+  double                _sigACOff;
+  double                _sigSatOff;
+  double                _sigClk;
   SymmetricMatrix       _QQ;
 };