[hamradio-commits] [gnss-sdr] 134/303: RINEX obs files GPS dual-band: Fill obs with 0s if signal is not present
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:35:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit d4a14c3f2dc6f2b6e5d3c534506208a49ec05f51
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Tue Nov 1 14:02:23 2016 +0100
RINEX obs files GPS dual-band: Fill obs with 0s if signal is not present
---
src/algorithms/PVT/libs/rinex_printer.cc | 38 ++++++++++++++++++----
.../pvt/rinex_printer_test.cc | 5 +++
2 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index a3e2179..606c320 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -3877,7 +3877,7 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c
}
-void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_CNAV_Ephemeris & eph, double obs_time, const std::map<int, Gnss_Synchro> & pseudoranges)
+void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_CNAV_Ephemeris & eph, double obs_time, const std::map<int, Gnss_Synchro> & pseudoranges)
{
// RINEX observations timestamps are GPS timestamps.
std::string line;
@@ -3998,7 +3998,7 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_CNAV_Ephemeris
}
-void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph, const Gps_CNAV_Ephemeris & eph_cnav, double obs_time, const std::map<int, Gnss_Synchro> & pseudoranges)
+void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph, const Gps_CNAV_Ephemeris & eph_cnav, double obs_time, const std::map<int, Gnss_Synchro> & pseudoranges)
{
if(eph_cnav.d_i_0){} // avoid warning, not needed
// RINEX observations timestamps are GPS timestamps.
@@ -4048,6 +4048,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph
std::map<int, Gnss_Synchro>::const_iterator pseudoranges_iter;
std::map<int, Gnss_Synchro>::const_iterator pseudoranges_iter2;
+ std::multimap<unsigned int, Gnss_Synchro> total_mmap;
+ std::multimap<unsigned int, Gnss_Synchro>::iterator mmap_iter;
for(pseudoranges_iter = pseudoranges.begin();
pseudoranges_iter != pseudoranges.end();
pseudoranges_iter++)
@@ -4057,14 +4059,40 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph
if((system_.compare("G") == 0) && (sig_.compare("1C") == 0))
{
pseudorangesL1.insert(std::pair<int, Gnss_Synchro>(pseudoranges_iter->first, pseudoranges_iter->second));
+ total_mmap.insert(std::pair<unsigned int, Gnss_Synchro>(pseudoranges_iter->second.PRN, pseudoranges_iter->second));
}
if((system_.compare("G") == 0) && (sig_.compare("2S") == 0))
{
pseudorangesL2.insert(std::pair<int, Gnss_Synchro>(pseudoranges_iter->first, pseudoranges_iter->second));
+ mmap_iter = total_mmap.find(pseudoranges_iter->second.PRN);
+ if(mmap_iter == total_mmap.end())
+ {
+ Gnss_Synchro gs = Gnss_Synchro();
+ total_mmap.insert(std::pair<unsigned int, Gnss_Synchro>(pseudoranges_iter->second.PRN, gs));
+ }
+ total_mmap.insert(std::pair<unsigned int, Gnss_Synchro>(pseudoranges_iter->second.PRN, pseudoranges_iter->second));
+ }
+ }
+
+ // Fill with zeros satellites with L1 obs but not L2
+ std::multimap<unsigned int, Gnss_Synchro> mmap_aux;
+ mmap_aux = total_mmap;
+ for(mmap_iter = mmap_aux.begin();
+ mmap_iter != mmap_aux.end();
+ mmap_iter++)
+ {
+ if((total_mmap.count(mmap_iter->second.PRN)) == 1 && (mmap_iter->second.PRN != 0))
+ {
+ Gnss_Synchro gs = Gnss_Synchro();
+ std::string sys = "G";
+ gs.System = *sys.c_str();
+ std::string sig = "2S";
+ std::memcpy((void*)gs.Signal, sig.c_str(), 3);
+ gs.PRN = mmap_iter->second.PRN;
+ total_mmap.insert(std::pair<unsigned int, Gnss_Synchro>(mmap_iter->second.PRN, gs));
}
}
- std::multimap<unsigned int, Gnss_Synchro> total_map;
std::set<unsigned int> available_prns;
std::set<unsigned int>::iterator it;
for(pseudoranges_iter = pseudorangesL1.begin();
@@ -4072,7 +4100,6 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph
pseudoranges_iter++)
{
unsigned int prn_ = pseudoranges_iter->second.PRN;
- total_map.insert(std::pair<unsigned int, Gnss_Synchro>(prn_, pseudoranges_iter->second));
it = available_prns.find(prn_);
if(it == available_prns.end())
{
@@ -4085,7 +4112,6 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph
pseudoranges_iter++)
{
unsigned int prn_ = pseudoranges_iter->second.PRN;
- total_map.insert(std::pair<unsigned int, Gnss_Synchro>(prn_, pseudoranges_iter->second));
it = available_prns.find(prn_);
if(it == available_prns.end())
{
@@ -4111,7 +4137,7 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph
lineObs += satelliteSystem["GPS"];
if (static_cast<int>(*it) < 10) lineObs += std::string(1, '0');
lineObs += boost::lexical_cast<std::string>(static_cast<int>(*it));
- ret = total_map.equal_range(*it);
+ ret = total_mmap.equal_range(*it);
for (std::multimap<unsigned int, Gnss_Synchro>::iterator iter = ret.first; iter != ret.second; ++iter)
{
lineObs += Rinex_Printer::rightJustify(asString(iter->second.Pseudorange_m, 3), 14);
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc
index e03d382..2253895 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc
@@ -249,6 +249,11 @@ TEST(Rinex_Printer_Test, GpsObsLogDualBand)
gs4.Carrier_Doppler_hz = 1534;
gs4.CN0_dB_hz = 42;
+ gs3.Pseudorange_m = 22000007;
+ gs3.Carrier_phase_rads = -23.4;
+ gs3.Carrier_Doppler_hz = -1534;
+ gs3.CN0_dB_hz = 47;
+
gnss_pseudoranges_map.insert( std::pair<int, Gnss_Synchro>(1,gs1) );
gnss_pseudoranges_map.insert( std::pair<int, Gnss_Synchro>(2,gs2) );
gnss_pseudoranges_map.insert( std::pair<int, Gnss_Synchro>(3,gs3) );
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list