From ba2510ffc40738df6c5b269e80aec287c1122f60 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Mon, 19 Oct 2020 18:58:24 +0200
Subject: [PATCH] ups! now ok
---
src/processor/processor_tracker_gnss.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/processor/processor_tracker_gnss.cpp b/src/processor/processor_tracker_gnss.cpp
index 57b37da5e..a9bb2bafc 100644
--- a/src/processor/processor_tracker_gnss.cpp
+++ b/src/processor/processor_tracker_gnss.cpp
@@ -30,8 +30,8 @@ void ProcessorTrackerGnss::preProcess()
GnssUtils::Options copy_opt = params_tracker_gnss_->gnss_opt;
bool eph_sbas34 = params_tracker_gnss_->gnss_opt.sateph == EPHOPT_SBAS3 or
params_tracker_gnss_->gnss_opt.sateph == EPHOPT_SBAS4;
- bool iono_sbas34 = params_tracker_gnss_->gnss_opt.ionopt == IONOOPT_SBAS3 or
- params_tracker_gnss_->gnss_opt.ionopt == IONOOPT_SBAS4;
+ bool iono_sbas34 = params_tracker_gnss_->gnss_opt.ionoopt == IONOOPT_SBAS3 or
+ params_tracker_gnss_->gnss_opt.ionoopt == IONOOPT_SBAS4;
#ifdef _WOLF_DEBUG
int n_initial = inc_snapshot->getObservations()->size();
@@ -43,10 +43,10 @@ void ProcessorTrackerGnss::preProcess()
if (eph_sbas34)
copy_opt.sateph = EPHOPT_SBAS;
if (iono_sbas34)
- copy_opt.ionoopt = IONOPT_SBAS;
+ copy_opt.ionoopt = IONOOPT_SBAS;
// compute satellites positions
- inc_snapshot ->computeSatellites(copy_opt);
+ inc_snapshot ->computeSatellites(copy_opt.sateph);
/* iono, tropo, eph and sbas options are the less restrictive to avoid RTKLIB to discard satellites
* corrections are applied in computeRanges, this fix is only used for:
@@ -114,7 +114,7 @@ void ProcessorTrackerGnss::preProcess()
// compute corrected Ranges
inc_snapshot->computeRanges(fix_incoming_.sat_azel,
fix_incoming_.lat_lon,
- params_tracker_gnss_->gnss_opt);
+ copy_opt);
/* NOT ENOUGH SATS/RANGES in case of sbas34:
* eph: EPHOPT_SBAS3 and EPHOPT_SBAS4
@@ -126,9 +126,9 @@ void ProcessorTrackerGnss::preProcess()
WOLF_DEBUG("ProcessorTrackerGnss::preProcess: with SBAS3/SBAS4, not enough ranges: ", inc_snapshot->getObservations()->size(), " Computing with SBAS2/BRDC");
if (params_tracker_gnss_->gnss_opt.sateph == EPHOPT_SBAS3)
- copy_opt.sateph.sateph = EPHOPT_SBAS2;
+ copy_opt.sateph = EPHOPT_SBAS2;
if (params_tracker_gnss_->gnss_opt.sateph == EPHOPT_SBAS4)
- copy_opt.sateph.sateph = EPHOPT_BRDC;
+ copy_opt.sateph = EPHOPT_BRDC;
if (params_tracker_gnss_->gnss_opt.ionoopt == IONOOPT_SBAS3)
copy_opt.ionoopt = IONOOPT_SBAS2;
--
GitLab