Changeset 9866 in ntrip for trunk/BNC/src/PPP

Timestamp:

Oct 31, 2022, 9:49:58 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/PPP

Files:

• pppSatObs.cpp (modified) (2 diffs)
• pppSatObs.h (modified) (1 diff)

trunk/BNC/src/PPP/pppSatObs.cpp ¶

@@ -46 +46 @@
   _stecRefSat = 0.0;
   _stecSat    = 0.0;
+  _signalPriorities = QString::fromStdString(OPT->_signalPriorities);
+  if (!_signalPriorities.size()) {
+    if (OPT->_obsModelType == OPT->DCMcodeBias || 
+        OPT->_obsModelType == OPT->DCMphaseBias) {
+      // at the moment only one code or phase bias per system (G,R,E,C)/modulation considered
+      _signalPriorities = "G:12&CW R:12&CP E:1&CX E:5&QX C:26&I";
+    }
+    else {
+      _signalPriorities = "G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX";
+    }
+  }
+
   for (unsigned ii = 0; ii < t_frequency::max; ii++) {
     _obs[ii] = 0;
@@ -68 +80 @@
   // Select pseudo-ranges and phase observations
   // -------------------------------------------
-
-  QString preferredAttribList = "G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX";
-  if (OPT->_obsModelType == OPT->DCMcodeBias ||
-      OPT->_obsModelType == OPT->DCMphaseBias) {
-    // at the moment only one code or phase bias per system (G,R,E,C)/modulation considered
-    preferredAttribList = "G:12&CW R:12&CP E:1&CX E:5&QX C:26&I";
-  }
-  QStringList priorList = preferredAttribList.split(" ", QString::SkipEmptyParts);
+  QStringList priorList = _signalPriorities.split(" ", QString::SkipEmptyParts);
   string preferredAttrib;
   char obsSys = pppSatObs._prn.system();  //cout << "SATELLITE: " << pppSatObs._prn.toString() << endl;

trunk/BNC/src/PPP/pppSatObs.h ¶

@@ -152 +152 @@
   double                       _stecSat;
   double                       _tropo0;
-};
+  QString                      _signalPriorities;
+        };
 
 }