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

Timestamp:

Oct 8, 2026, 11:47:35 AM (3 weeks ago)

Author:

stuerze

Message:

combi can be based on CoM

Location:

trunk/BNC/src/combination

Files:

• bnccomb.cpp (modified) (6 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/src/combination/bnccomb.cpp

@@ -296 +296 @@
   }
 
+  // Reference point of the combination: with ACs of both kinds (APC streams
+  // 'SSRA...', CoM streams 'SSRC...') and an ANTEX file, the combination is
+  // done in the CoM frame and the orbits of the APC ACs are converted to
+  // CoM; otherwise in the frame of the master AC (ACs of the other kind are
+  // not used)
+  // ------------------------------------------------------------------------
+  bool hasAPC = false, hasCoM = false;
+  for (const cmbAC* AC : _ACs) {
+    if (AC->isAPC) hasAPC = true; else hasCoM = true;
+  }
+  _cmbCoM = (_antex && hasAPC && hasCoM);
+  if (_cmbCoM) {
+    for (QMap<char, bool>::iterator it = _masterIsAPC.begin(); it != _masterIsAPC.end(); ++it) {
+      it.value() = false;
+    }
+    emit newMessage("bncComb: APC and CoM streams configured - combination in the CoM frame, "
+                    "orbits of the APC streams converted to CoM", true);
+  }
+  else if (hasAPC && hasCoM) {
+    emit newMessage("bncComb: APC and CoM streams configured, but no ANTEX file - only the streams "
+                    "with the reference point of the master AC are combined", true);
+  }
+  if (!_antex && hasCoM) {
+    emit newMessage("bncComb: CoM streams configured, but no ANTEX file - the combined orbits (INTERNAL) "
+                    "may refer to the CoM, while the PPP assumes the APC", true);
+  }
+
 
   // Bias SINEX File
@@ -610 +637 @@
       }
     }
-    if (acName.isEmpty() ||
-        isAPC != _masterIsAPC[sys] ||
-        excludeSat(newClk._prn, excludeSats)) {
+    if (acName.isEmpty() || excludeSat(newClk._prn, excludeSats)) {
+      continue;
+    }
+    if (!_cmbCoM && isAPC != _masterIsAPC[sys]) {
+      bncTime& warned = _refPointWarned[acName + sys];
+      if (!warned.valid() || newClk._time - warned >= 3600.0) {
+        warned = newClk._time;
+        emit newMessage("bncComb: " + acName.toLatin1() + " " + QByteArray(1, sys) + " not combined: its orbits refer to the " +
+                        (isAPC ? "APC" : "CoM") + ", those of the master AC " + _masterOrbitAC[sys].toLatin1() +
+                        " to the " + (isAPC ? "CoM" : "APC") +
+                        " (an ANTEX file allows to combine both in the CoM frame)", true);
+      }
       continue;
     }
@@ -949 +985 @@
     }
 
+    // Orbits of an APC AC in a combination in the CoM frame
+    // ------------------------------------------------------
+    if (_cmbCoM) {
+      const cmbAC* AC = 0;
+      for (const cmbAC* ac : _ACs) {
+        if (ac->name == acName) {
+          AC = ac;
+          break;
+        }
+      }
+      if (AC && AC->isAPC && convertApcToCoM(_newCorr, AC) != success) {
+        delete _newCorr; _newCorr = 0;
+        continue;
+      }
+    }
+
     // Store correction into the buffer
     // --------------------------------
@@ -1047 +1099 @@
               << AC->name.toLatin1().data()   << "\n";
           _masterOrbitAC[sys] = AC->name;
-          _masterIsAPC[sys]   = AC->isAPC;
+          _masterIsAPC[sys]   = _cmbCoM ? false : AC->isAPC;
           break;
         }
@@ -1320 +1372 @@
 }
 
+// Convert the orbit correction of an APC AC to the satellite's CoM: the
+// antenna offset (ANTEX, single reference frequency, attitude as configured
+// for the AC) is added to the correction in radial, along-track and
+// cross-track direction. The clock correction is not affected.
+////////////////////////////////////////////////////////////////////////////
+t_irc bncComb::convertApcToCoM(cmbCorr* corr, const cmbAC* AC) {
+  corr->_eph->setOrbCorr(&corr->_orbCorr);
+  corr->_eph->setClkCorr(&corr->_clkCorr);
+  ColumnVector xc(6), vv(3);
+  if (corr->_eph->getCrd(corr->_time, xc, vv, true) != success) {
+    return failure;
+  }
+  bncAntex::e_attMode attMode = bncAntex::ATT_COMPUTED;
+  double              extYaw  = 0.0;
+  if (AC->attitudeSource == "SSR" && corr->_satYawAngleValid) {
+    attMode = bncAntex::ATT_EXTERNAL;
+    extYaw  = corr->_satYawAngle;
+  }
+  else if (AC->attitudeSource == "Nominal") {
+    attMode = bncAntex::ATT_NOMINAL;
+  }
+  double Mjd = corr->_time.mjd() + corr->_time.daysec() / 86400.0;
+  ColumnVector dx(3); dx = 0.0;
+  if (_antex->satCoMcorrection(corr->_prn, Mjd, xc.Rows(1,3), vv, dx, attMode, extYaw, AC->name) != success) {
+    if (_antex->warnNoSatEntry(corr->_prn, corr->_time)) {
+      emit newMessage("bncComb: no satellite antenna entry valid at " +
+                      QByteArray(corr->_time.datestr().c_str()) + " " + QByteArray(corr->_time.timestr().c_str()) +
+                      " for " + corr->_prn.mid(0,3).toLatin1() +
+                      " in ANTEX file - APC orbit of " + AC->name.toLatin1() + " not converted to CoM, not combined", true);
+    }
+    return failure;
+  }
+  // X = X_brdc - RSW(xr): X_CoM = X_APC - dx  =>  xr_CoM = xr_APC + RSW(dx)
+  ColumnVector dRAO(3);
+  XYZ_to_RSW(xc.Rows(1,3), vv, dx, dRAO);
+  corr->_orbCorr._xr += dRAO;
+  return success;
+}
+
 // Report AC satellites rejected as outliers in most epochs
 ////////////////////////////////////////////////////////////////////////////
@@ -1544 +1635 @@
       apc(2) = xc(2)+dx(2);
       apc(3) = xc(3)+dx(3);
+    }
+
+    // The combined corrections passed on to the PPP (INTERNAL) always refer
+    // to the APC: orbits combined in the CoM frame are converted
+    if (!masterIsAPC && _antex) {
+      ColumnVector dRAO(3);
+      XYZ_to_RSW(xc.Rows(1,3), vv, dx, dRAO);
+      orbCorrections.back()._xr -= dRAO;
     }
 

trunk/BNC/src/combination/bnccomb.h

@@ -280 +280 @@
   void checkBiasConsistency(bncTime epoTime, char sys, QTextStream& out);
   void checkPersistentOutliers(bncTime epoTime, char sys, QTextStream& out);
+  t_irc convertApcToCoM(cmbCorr* corr, const cmbAC* AC);
+  bool                                       _cmbCoM;          // combination in the CoM frame, APC ACs converted
+  QMap<QString, bncTime>                     _refPointWarned;  // last 'APC/CoM differs from master' warning per AC
   struct t_outlierStat {
     t_outlierStat() : numEpo(0) {}