mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-05-25 18:54:08 +00:00
Code Issues Releases Wiki Activity

RINEX obs files GPS dual-band: Fill obs with 0s if signal is not present

Browse Source
This commit is contained in:
Carles Fernandez 2016-11-01 14:02:23 +01:00
parent ece71a53fb
commit d4a14c3f2d
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/algorithms/PVT/libs/rinex_printer.cc
View File

@ -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_iter;
std::map<int, Gnss_Synchro>::const_iterator pseudoranges_iter2; 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(); for(pseudoranges_iter = pseudoranges.begin();
pseudoranges_iter != pseudoranges.end(); pseudoranges_iter != pseudoranges.end();
pseudoranges_iter++) 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)) if((system_.compare("G") == 0) && (sig_.compare("1C") == 0))
{ {
pseudorangesL1.insert(std::pair<int, Gnss_Synchro>(pseudoranges_iter->first, pseudoranges_iter->second)); 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)) if((system_.compare("G") == 0) && (sig_.compare("2S") == 0))
{ {
pseudorangesL2.insert(std::pair<int, Gnss_Synchro>(pseudoranges_iter->first, pseudoranges_iter->second)); 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> available_prns;
std::set<unsigned int>::iterator it; std::set<unsigned int>::iterator it;
for(pseudoranges_iter = pseudorangesL1.begin(); for(pseudoranges_iter = pseudorangesL1.begin();
@ -4072,7 +4100,6 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph
pseudoranges_iter++) pseudoranges_iter++)
{ {
unsigned int prn_ = pseudoranges_iter->second.PRN; 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_); it = available_prns.find(prn_);
if(it == available_prns.end()) if(it == available_prns.end())
{ {
@ -4085,7 +4112,6 @@ void Rinex_Printer::log_rinex_obs(std::fstream & out, const Gps_Ephemeris & eph
pseudoranges_iter++) pseudoranges_iter++)
{ {
unsigned int prn_ = pseudoranges_iter->second.PRN; 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_); it = available_prns.find(prn_);
if(it == available_prns.end()) 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"]; lineObs += satelliteSystem["GPS"];
if (static_cast<int>(*it) < 10) lineObs += std::string(1, '0'); if (static_cast<int>(*it) < 10) lineObs += std::string(1, '0');
lineObs += boost::lexical_cast<std::string>(static_cast<int>(*it)); 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) 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); lineObs += Rinex_Printer::rightJustify(asString(iter->second.Pseudorange_m, 3), 14);

5
src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc
View File

@ -249,6 +249,11 @@ TEST(Rinex_Printer_Test, GpsObsLogDualBand)
gs4.Carrier_Doppler_hz = 1534; gs4.Carrier_Doppler_hz = 1534;
gs4.CN0_dB_hz = 42; 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>(1,gs1) );
gnss_pseudoranges_map.insert( std::pair<int, Gnss_Synchro>(2,gs2) ); gnss_pseudoranges_map.insert( std::pair<int, Gnss_Synchro>(2,gs2) );
gnss_pseudoranges_map.insert( std::pair<int, Gnss_Synchro>(3,gs3) ); gnss_pseudoranges_map.insert( std::pair<int, Gnss_Synchro>(3,gs3) );