Changeset 11057 in ntrip for trunk/BNC/src/rinex/reqcanalyze.cpp

Timestamp:

Sep 30, 2026, 11:30:26 AM (6 days ago)

Author:

stuerze

Message:

bug fixes resulting from overall tests

File:

• trunk/BNC/src/rinex/reqcanalyze.cpp (modified) (6 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -131 +131 @@
   // ----------------
   t_reqcEdit::readEphemerides(_navFileNames, _ephs, _logStream, _checkEph);
+  t_reqcEdit::indexEphemerides(_ephs, _ephsByPrn);
 
   // Loop over all RINEX Files
@@ -207 +208 @@
           continue;
         }
+        // observations of unhealthy satellites are excluded, as those
+        // below the elevation mask (see also setExpectedObs)
+        if (_navFileNames.size() && unhealthyAt(rnxSat.prn, _currEpo->tt)) {
+          continue;
+        }
         t_satObs satObs;
         t_rnxObsFile::setObsFromRnx(obsFile, _currEpo, rnxSat, satObs);
@@ -266 +272 @@
     }
 
-    t_eph* eph = 0;
-    for (int ie = 0; ie < _ephs.size(); ie++) {
-      if (_ephs[ie]->prn() == prn) {
-        eph = _ephs[ie];
-        break;
-      }
-    }
+    if (unhealthyAt(prn, _currEpo->tt)) {
+      continue;
+    }
+    t_eph* eph = ephForTime(prn, _currEpo->tt);
     if (eph) {
       ColumnVector xSat(6);
@@ -328 +331 @@
                              t_qcSat& qcSat) {
 
-  t_eph* eph = 0;
-  for (int ie = 0; ie < _ephs.size(); ie++) {
-    if (_ephs[ie]->prn() == satObs._prn) {
-      eph = _ephs[ie];
-      break;
-    }
-  }
+  t_eph* eph = ephForTime(satObs._prn, epoTime);
   if (eph) {
     ColumnVector xc(6);
@@ -976 +973 @@
                                    double interval, const ColumnVector& xyzSta) {
   for(QMap<t_prn, int>::iterator it = _numExpObs.begin(); it != _numExpObs.end(); it++) {
-    t_eph* eph = 0;
+    bool navAvail = false;
     for (int ie = 0; ie < _ephs.size(); ie++) {
       if (_ephs[ie]->prn() == it.key()) {
-        eph = _ephs[ie];
+        navAvail = true;
         break;
       }
     }
-    if (eph) {
+    if (navAvail) {
       int numExpObs = 0;
       bncTime epoTime;
       for (epoTime = startTime - interval; epoTime < endTime; epoTime = epoTime + interval) {
+        // an observation is only expected if a valid ephemeris exists,
+        // the satellite is healthy (unhealthy satellite-epochs are also
+        // excluded from the observations, see analyzeFile) and above
+        // the elevation mask
+        if (unhealthyAt(it.key(), epoTime)) {
+          continue;
+        }
+        t_eph* eph = ephForTime(it.key(), epoTime, true);
+        if (!eph) {
+          continue;
+        }
         ColumnVector xc(6);
         ColumnVector vv(3);
@@ -1007 +1015 @@
   }
 }
+
+// A satellite is considered unhealthy at epoch tt if the valid navigation
+// data set closest to tt is flagged unhealthy. Its orbit is not used then
+// (the geometry may be erroneous) and its observations are excluded.
+////////////////////////////////////////////////////////////////////////////
+bool t_reqcAnalyze::unhealthyAt(const t_prn& prn, const bncTime& tt) const {
+  t_eph* eph = ephForTime(prn, tt, true, true);
+  return eph && eph->checkState() == t_eph::unhealthy;
+}
+
+// Ephemeris of the given satellite for epoch tt, see t_reqcEdit::ephForTime
+////////////////////////////////////////////////////////////////////////////
+t_eph* t_reqcAnalyze::ephForTime(const t_prn& prn, const bncTime& tt,
+                                 bool validOnly, bool allowUnhealthy) const {
+  return t_reqcEdit::ephForTime(_ephsByPrn.value(prn), prn, tt, validOnly, allowUnhealthy);
+}