Changeset 10814 in ntrip for trunk/BNC/src/orbComp

Timestamp:

Mar 9, 2026, 4:26:40 PM (3 weeks ago)

Author:

stuerze

Message:

sp3Comp: separate results/mean values for BDS-2 and BDS-3 in summary

File:

• trunk/BNC/src/orbComp/sp3Comp.cpp (modified) (5 diffs)

trunk/BNC/src/orbComp/sp3Comp.cpp

@@ -225 +225 @@
     for (map<t_prn, double>::iterator it = dc.begin(); it != dc.end(); it++) {
       const t_prn& prn = it->first;
-      stringstream all; all << prn.system() << 99;
+      stringstream all;
+      if (prn.system() == 'C') {
+        if (prn.number() <= 16) {
+          all << "C-2";
+        }
+        else {
+          all << "C-3";
+        }
+      } else {
+        all << prn.system();
+      }
       if (satIndex(clkSats, prn) != -1) {
         int  index = epochs.size() + satIndex(clkSats, prn);
@@ -378 +388 @@
     for (map<t_prn, ColumnVector>::const_iterator it = dr.begin(); it != dr.end(); it++) {
       const t_prn&  prn = it->first;
-      stringstream all; all << prn.system() << 99;
+      stringstream all;
+      if (prn.system() == 'C') {
+        if (prn.number() <= 16) {
+          all << "C-2";
+        }
+        else {
+          all << "C-3";
+        }
+      } else {
+        all << prn.system();
+      }
+
       if (!excludeSat(prn)) {
         const ColumnVector& rao = it->second;
@@ -430 +451 @@
     const string& prn  = it->first;
     t_stat&       stat = it->second;
-    stringstream all; all << prn[0] << 99;
+    stringstream all;
+    if (prn[0] == 'C') {
+      int num = stoi(prn.substr(1,2));
+      if (num <= 16) {
+        all << "C-2";
+      }
+      else {
+        all << "C-3";
+      }
+    } else {
+      all << prn[0];
+    }
     if (stat._nr > 0) {
       stat._rao[0] = sqrt(stat._rao[0] / stat._nr);
@@ -442 +474 @@
       }
       else {
-        (_summaryOnly) ? out << "     "   << QString("%1  ").arg(all.str()[0]).toStdString() << " ":
-                         out << "!     "  << QString("%1  ").arg(all.str()[0]).toStdString() << " ";
+        (_summaryOnly) ? out << "     "    << QString("%1").arg(all.str().c_str(),3,' ').toStdString().c_str() << " ":
+                         out << "!     "  <<  QString("%1").arg(all.str().c_str(),3,' ').toStdString().c_str() << " ";
       }
       out << setw(10) << setprecision(1) << stat._rao[0]   * 1e3 << ' '
@@ -459 +491 @@
             << setw(10) << setprecision(2) << stat._dcRedSig / t_CST::c * 1e9 << ' '
             << setw( 9) << stat._nc << " ";
-        if (prn != all.str()) {
+        if (prn != "G" && prn != "R" && prn != "E" && prn != "C-2" &&  prn != "C-3") {
           out << setw( 9) << setprecision(2) << stat._offset / t_CST::c * 1e9;
         }