Skip to content
Snippets Groups Projects
Commit ba2510ff authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

ups! now ok

parent 642926e4
No related branches found
No related tags found
2 merge requests!28release after RAL,!27After 2nd RAL submission
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment