From c0ded6498009262b87c8510f58cffe20bf2efcd9 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Mon, 7 Sep 2020 18:01:20 +0200
Subject: [PATCH] same constellations for fix and better printing
---
include/gnss/processor/processor_tracker_gnss.h | 9 +++++++++
src/processor/processor_tracker_gnss.cpp | 6 +++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/include/gnss/processor/processor_tracker_gnss.h b/include/gnss/processor/processor_tracker_gnss.h
index 51b2fe882..2ad1aba72 100644
--- a/include/gnss/processor/processor_tracker_gnss.h
+++ b/include/gnss/processor/processor_tracker_gnss.h
@@ -82,6 +82,15 @@ struct ParamsProcessorTrackerGnss : public ParamsProcessorTrackerFeature
// COMPUTE FIX OPTIONS (RAIM)
fix_opt.elmin = 0;
fix_opt.maxgdop = 30;
+ // same constellations
+ fix_opt.GPS = gnss_opt.GPS;
+ fix_opt.SBS = gnss_opt.SBS;
+ fix_opt.GLO = gnss_opt.GLO;
+ fix_opt.GAL = gnss_opt.GAL;
+ fix_opt.QZS = gnss_opt.QZS;
+ fix_opt.CMP = gnss_opt.CMP;
+ fix_opt.IRN = gnss_opt.IRN;
+ fix_opt.LEO = gnss_opt.LEO;
}
std::string print() const
diff --git a/src/processor/processor_tracker_gnss.cpp b/src/processor/processor_tracker_gnss.cpp
index e48badba3..10ae2636a 100644
--- a/src/processor/processor_tracker_gnss.cpp
+++ b/src/processor/processor_tracker_gnss.cpp
@@ -105,9 +105,13 @@ void ProcessorTrackerGnss::preProcess()
untracked_incoming_features_[feat->satNumber()] = feat;
}
+ std::string discarded_str;
+ for (auto sat : fix_incoming_.discarded_sats)
+ discarded_str += std::to_string(sat) + " ";
+
WOLF_DEBUG("ProcessorTrackerGnss::preProcess()",
"\n\tinitial observations: ", n_initial,
- "\n\tRTKLIB discarded: ", fix_incoming_.discarded_sats.size(),
+ "\n\tRTKLIB discarded: ", fix_incoming_.discarded_sats.size(), " (", discarded_str, ")",
"\n\tgnssutils discarded: ", n_initial - untracked_incoming_features_.size() - fix_incoming_.discarded_sats.size(),
"\n\tdetected incoming features: ", untracked_incoming_features_.size());
}
--
GitLab