From 96f88c6f0ff8b70955f14c5e0941a4503dc392bf Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Wed, 28 Apr 2021 15:31:43 +0200
Subject: [PATCH] adapted to new tdcp_batch params
---
include/gnss/processor/processor_gnss_tdcp.h | 6 ++++--
include/gnss/processor/processor_tracker_gnss.h | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/gnss/processor/processor_gnss_tdcp.h b/include/gnss/processor/processor_gnss_tdcp.h
index c176ac651..13291adca 100644
--- a/include/gnss/processor/processor_gnss_tdcp.h
+++ b/include/gnss/processor/processor_gnss_tdcp.h
@@ -31,7 +31,8 @@ struct ParamsProcessorGnssTdcp : public ParamsProcessorGnssFix
{
tdcp.min_common_sats = _server.getParam<double>(prefix + _unique_name + "/tdcp/min_common_sats");
tdcp.raim_n = _server.getParam<double>(prefix + _unique_name + "/tdcp/raim_n");
- tdcp.raim_min_residual = _server.getParam<double>(prefix + _unique_name + "/tdcp/raim_min_residual");
+ tdcp.max_residual = _server.getParam<double>(prefix + _unique_name + "/tdcp/max_residual");
+ tdcp.residual_opt = _server.getParam<int> (prefix + _unique_name + "/tdcp/residual_opt");
tdcp.tdcp.sigma_atm = _server.getParam<double>(prefix + _unique_name + "/tdcp/sigma_atm");
tdcp.tdcp.sigma_carrier = _server.getParam<double>(prefix + _unique_name + "/tdcp/sigma_carrier");
tdcp.tdcp.time_window = _server.getParam<double>(prefix + _unique_name + "/tdcp/time_window");
@@ -49,7 +50,8 @@ struct ParamsProcessorGnssTdcp : public ParamsProcessorGnssFix
return "\n" + ParamsProcessorBase::print() + "\n"
+ "tdcp/min_common_sats: " + std::to_string(tdcp.min_common_sats) + "\n"
+ "tdcp/raim_n: " + std::to_string(tdcp.raim_n) + "\n"
- + "tdcp/raim_min_residual: "+ std::to_string(tdcp.raim_min_residual) + "\n"
+ + "tdcp/max_residual: " + std::to_string(tdcp.max_residual) + "\n"
+ + "tdcp/residual_opt: " + std::to_string(tdcp.residual_opt) + "\n"
+ "tdcp/sigma_atm: " + std::to_string(tdcp.tdcp.sigma_atm) + "\n"
+ "tdcp/sigma_carrier: " + std::to_string(tdcp.tdcp.sigma_carrier)+ "\n"
+ "tdcp/time_window: " + std::to_string(tdcp.tdcp.time_window) + "\n";
diff --git a/include/gnss/processor/processor_tracker_gnss.h b/include/gnss/processor/processor_tracker_gnss.h
index ab710f73b..2bfbfb3c1 100644
--- a/include/gnss/processor/processor_tracker_gnss.h
+++ b/include/gnss/processor/processor_tracker_gnss.h
@@ -75,9 +75,10 @@ struct ParamsProcessorTrackerGnss : public ParamsProcessorTrackerFeature
{
tdcp_batch_params.min_common_sats = _server.getParam<int> (prefix + _unique_name + "/gnss/tdcp/min_common_sats");
tdcp_batch_params.raim_n = _server.getParam<int> (prefix + _unique_name + "/gnss/tdcp/raim_n");
- tdcp_batch_params.raim_min_residual = _server.getParam<double> (prefix + _unique_name + "/gnss/tdcp/raim_min_residual");
+ tdcp_batch_params.max_residual = _server.getParam<double> (prefix + _unique_name + "/gnss/tdcp/max_residual");
tdcp_batch_params.relinearize_jacobian = _server.getParam<bool> (prefix + _unique_name + "/gnss/tdcp/relinearize_jacobian");
tdcp_batch_params.max_iterations = _server.getParam<int> (prefix + _unique_name + "/gnss/tdcp/max_iterations");
+ tdcp_batch_params.residual_opt = _server.getParam<int> (prefix + _unique_name + "/gnss/tdcp/residual_opt");
tdcp_batch_params.tdcp.multi_freq = gnss_opt.tdcp.multi_freq;
tdcp_batch_params.tdcp = gnss_opt.tdcp;
}
--
GitLab