Changeset 10034 in ntrip for trunk/BNC/src/PPP/pppSatObs.cpp

Timestamp:

Apr 21, 2023, 11:48:24 AM (12 months ago)

Author:

stuerze

Message:

 

File:

• trunk/BNC/src/PPP/pppSatObs.cpp (modified) (6 diffs)

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -44 +44 @@
   _valid      = true;
   _reference  = false;
-  _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";
-    }
+    _signalPriorities = "G:12&CWPSLX R:12&CP E:1&CBX E:5&QIX C:26&IQX";
   }
 
@@ -109 +101 @@
             if (obs->_rnxType2ch == obsType.toStdString() &&
                 obs->_codeValid && obs->_code &&
-                obs->_phaseValid && obs->_phase) {
+                obs->_phaseValid && obs->_phase &&
+                obs->_lockTimeValid &&  obs->_lockTime > 5.0) {
               _obs[iFreq] = new t_frqObs(*obs); //cout << "================> newObs: " << obs->_rnxType2ch <<endl;
             }
@@ -261 +254 @@
   // Pseudo observations
   if (tLC == t_lc::GIM) {
-    if (_stecRefSat == 0.0 || _stecSat == 0.0) {
+    if (_stecSat == 0.0) {
       if (valid) *valid = false;
       return 0.0;
     }
     else {
-      return _stecRefSat;
+      return _stecSat;
     }
   }
@@ -339 +332 @@
 
   if (tLC == t_lc::GIM) {
-    retVal = OPT->_sigmaGIM * OPT->_sigmaGIM + OPT->_sigmaGIM * OPT->_sigmaGIM;
+    retVal = OPT->_sigmaGIM * OPT->_sigmaGIM;
   }
 
@@ -587 +580 @@
     double f1GPS = t_CST::freq(t_frequency::G1, 0);
     for (unsigned iFreq = 1; iFreq < t_frequency::max; iFreq++) {
-      if (OPT->_pseudoObsIono) { // DCMcodeBias, DCMphaseBias
+      if (OPT->_pseudoObsIono) {
         // For scaling the slant ionospheric delays the trick is to be consistent with units!
         // The conversion of TECU into meters requires the frequency of the signal.
@@ -737 +730 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void  t_pppSatObs::setPseudoObsIono(t_frequency::type freq, double stecRefSat) {
+bool  t_pppSatObs::setPseudoObsIono(t_frequency::type freq) {
+  bool pseudoObsIono = false;
   _stecSat    = _model._ionoCodeDelay[freq];
-  _stecRefSat = stecRefSat;
-}
+  if (_stecSat) {
+    pseudoObsIono = true;
+  }
+  return pseudoObsIono;
+}