Changeset 3028 in ntrip

Timestamp:

Feb 24, 2011, 1:03:07 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

@@ -37 +37 @@
   prn   = prnIn;
   xx    = 0.0;
+  iod   = -1;
 }
 
@@ -206 +207 @@
     t_eph* prevEph = _eph[newCorr->prn]->prev;
     if (prevEph && prevEph->IOD() == newCorr->iod) {
-      switchToLastEph(lastEph, prevEph, newCorr);
+      switchToLastEph(AC->name, lastEph, prevEph, newCorr);
     }
     else if (!lastEph || lastEph->IOD() != newCorr->iod) {
@@ -356 +357 @@
 // Change the correction so that it refers to last received ephemeris 
 ////////////////////////////////////////////////////////////////////////////
-void bncComb::switchToLastEph(const t_eph* lastEph, const t_eph* prevEph, 
-                              t_corr* newCorr) {
+void bncComb::switchToLastEph(const QString& ACname, const t_eph* lastEph, 
+                              const t_eph* prevEph, t_corr* newCorr) {
+
   ColumnVector oldXC(4);
   ColumnVector oldVV(3);
@@ -386 +388 @@
     + QString(" %1 -> %2 %3").arg(prevEph->IOD(),3)
     .arg(lastEph->IOD(),3).arg(dC*t_CST::c, 8, 'f', 4);
+
+  // Check/change the static offset parameters
+  // -----------------------------------------
+  for (int iPar = 1; iPar <= _params.size(); iPar++) {
+    cmbParam* pp = _params[iPar-1];
+    if (pp->type == cmbParam::Sat_offset &&
+        pp->prn  == newCorr->prn         &&
+        pp->AC   == ACname) {
+      if (pp->iod != lastEph->IOD()) {
+        pp->iod = lastEph->IOD();
+        msg += " need corr ";
+      }
+    }
+  }
 
   emit newMessage(msg.toAscii(), false);

trunk/BNC/combination/bnccomb.h

@@ -21 +21 @@
   QString prn;
   double  xx;
+  int     iod;
 };
 
@@ -71 +72 @@
   void printResults(QTextStream& out, const bncTime& resTime,
                     const QMap<QString, t_corr*>& resCorr);
-  void switchToLastEph(const t_eph* lastEph, const t_eph* prevEph, 
-                       t_corr* newCorr);
+  void switchToLastEph(const QString& ACname, const t_eph* lastEph, 
+                       const t_eph* prevEph, t_corr* newCorr);
 
   QMap<QString, cmbAC*> _ACs;   // Analytical Centers (key is mountpoint)