Changeset 11058 in ntrip for trunk/BNC/src/combination/bnccomb.cpp

Timestamp:

Sep 30, 2026, 10:52:22 PM (17 hours ago)

Author:

stuerze

Message:

some more fixes

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (5 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -535 +535 @@
 
 
+// True if every AC has delivered clock corrections for an epoch after epoTime
+////////////////////////////////////////////////////////////////////////////
+bool bncComb::allACsBeyond(const bncTime& epoTime) const {
+  QListIterator<cmbAC*> itAC(_ACs);
+  while (itAC.hasNext()) {
+    const cmbAC* AC = itAC.next();
+    bncTime acLast = _acLastClkTime.value(AC->name);
+    if (!acLast.valid() || !(acLast > epoTime)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 // Process clock corrections
 ////////////////////////////////////////////////////////////////////////////
@@ -552 +566 @@
     if (!_cmbSysPrn.contains(sys)){
       continue;
+    }
+
+    // Remember the latest correction epoch of each AC (whether or not the
+    // correction is used), to know when an AC has finished an epoch
+    // --------------------------------------------------------------------
+    QListIterator<cmbAC*> itAC(_ACs);
+    while (itAC.hasNext()) {
+      cmbAC* AC = itAC.next();
+      if (AC->mountPoint == QString(newClk._staID.c_str())) {
+        bncTime& acLast = _acLastClkTime[AC->name];
+        if (!acLast.valid() || newClk._time > acLast) {
+          acLast = newClk._time;
+        }
+        break;
+      }
     }
 
@@ -665 +694 @@
       }
     }
-    // Process the front epoch
-    // -----------------------
-    if (epoTime < (_lastClkCorrTime - outWait)) {
+    // Process the front epoch as soon as all ACs have delivered corrections
+    // for a later epoch (i.e. have finished this one), at the latest when
+    // the newest correction is maxWait newer (an AC may be late or missing).
+    // Waiting only outWait after the newest correction lost the corrections
+    // of ACs with a few seconds more latency ("old correction").
+    // -----------------------------------------------------------------------
+    const double maxWait = max(10.0, outWait);
+    if (allACsBeyond(epoTime) || epoTime < (_lastClkCorrTime - maxWait)) {
       _resTime = epoTime;
       processEpoch(_resTime, clkCorrVec);
@@ -834 +868 @@
               codeBiasesRefSig[frqType] = bias._value;
             }
+          }
+        }
+        // Code biases present, but not for both reference signals (e.g.
+        // Galileo HAS): the AC clocks cannot be referred to the reference
+        // signals and are used as they are - warn (at most once per hour
+        // per AC and system)
+        if (codeBiasesRefSig.size() < 2) {
+          QString key = acName + sys;
+          bncTime& warned = _refBiasWarned[key];
+          if (!warned.valid() || _newCorr->_time - warned >= 3600.0) {
+            warned = _newCorr->_time;
+            QString refSig;
+            for (unsigned ii = 1; ii < cmbRefSig::cIF; ii++) {
+              t_frequency::type frqType = cmbRefSig::toFreq(sys, static_cast<cmbRefSig::type>(ii));
+              refSig += QString(" C%1%2").arg(t_frequency::toString(frqType)[1])
+                                         .arg(cmbRefSig::toAttrib(sys, static_cast<cmbRefSig::type>(ii)));
+            }
+            emit newMessage("bncComb: " + acName.toLatin1() + " provides no code biases for the " +
+                            QByteArray(1, sys) + " reference signals" + refSig.toLatin1() +
+                            " - its clocks are combined without referring them to these signals", false);
           }
         }
@@ -1398 +1452 @@
     double dC_apriori_corr = dC_orb;// + dC_att; can be added if useful values are provided by the ACs
 
-    ll(iObs) = ((corr->_clkCorr._dClk * t_CST::c) - dC_apriori_corr - corr->_satCodeBiasIF) - DotProduct(AA.Row(iObs), x0);
+    // Clock referred to the ionosphere-free combination of the reference
+    // signals: dt - (alpha b1 + beta b2) with biases in Bias-SINEX sign
+    // (subtracted from observations, Banville et al. 2020, Eq. 1). The code
+    // biases taken from the SSR streams have the opposite sign (added to
+    // observations), hence + _satCodeBiasIF.
+    ll(iObs) = ((corr->_clkCorr._dClk * t_CST::c) - dC_apriori_corr + corr->_satCodeBiasIF) - DotProduct(AA.Row(iObs), x0);
 
     PP(iObs, iObs) *= 1.0 / (corr->_weightFactor * corr->_weightFactor);