From 484c8222a255a6f1071400a9283c8f6efd0ed19a Mon Sep 17 00:00:00 2001 From: joanvallve <jvallve@iri.upc.edu> Date: Mon, 19 Oct 2020 23:10:46 +0200 Subject: [PATCH] not adding wrong ranges --- src/observations.cpp | 4 ++-- src/range.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/observations.cpp b/src/observations.cpp index c042aa0..bb4bb5e 100644 --- a/src/observations.cpp +++ b/src/observations.cpp @@ -430,7 +430,7 @@ std::set<int> Observations::filter(const Satellites& sats, if (remove_sats.count(sat_pair.first) == 0) if (satexclude(sat_pair.first,sat_pair.second.var, sat_pair.second.svh, NULL)) { - std::cout << "Discarding sat " << sat_pair.first << ": unhealthy or huge variance svh = " << sat_pair.second.svh << std::endl; + //std::cout << "Discarding sat " << sat_pair.first << ": unhealthy or huge variance svh = " << sat_pair.second.svh << std::endl; removeObservationBySat(sat_pair.first); remove_sats.insert(sat_pair.first); } @@ -505,7 +505,7 @@ std::set<int> Observations::filter(const Satellites& sats, if (remove_sats.count(sat_pair.first) == 0) if (satexclude(sat_pair.first,sat_pair.second.var, sat_pair.second.svh, NULL)) { - std::cout << "Discarding sat " << sat_pair.first << ": unhealthy or huge variance svh = " << sat_pair.second.svh << std::endl; + //std::cout << "Discarding sat " << sat_pair.first << ": unhealthy or huge variance svh = " << sat_pair.second.svh << std::endl; removeObservationBySat(sat_pair.first); remove_sats.insert(sat_pair.first); } diff --git a/src/range.cpp b/src/range.cpp index 9dccfe8..a990cbf 100644 --- a/src/range.cpp +++ b/src/range.cpp @@ -45,9 +45,6 @@ Ranges Range::computeRanges(ObservationsPtr obs, //std::cout << "\tsat " << sat << "..."; - // initialize with error values - ranges.emplace(sat,Range()); - /* ------------------- Pseudo range ------------------- */ /* psudorange with code bias correction */ //std::cout << "prange...\n"; @@ -67,7 +64,10 @@ Ranges Range::computeRanges(ObservationsPtr obs, //std::cout << "\tazel_i: " << azel_i[0] << " " << azel_i[1] << "\n"; //std::cout << "\topt.ionoopt: " << opt.ionoopt << "\n"; if (!ionocorr(obs_i.time,&nav->getNavigation(),sat,latlonalt.data(),azel_i,opt.ionoopt,&dion,&vion)) + { + //std::cout << " error in iono\n"; continue; + } /* GPS-L1 -> L1/B1 */ //std::cout << "iono2...\n"; @@ -83,6 +83,9 @@ Ranges Range::computeRanges(ObservationsPtr obs, } /* Store in PseudoRange struct */ + // initialize with error values + ranges.emplace(sat,Range()); + //std::cout << "storing\n"; ranges[sat].sat = sat; ranges[sat].P = P; -- GitLab