mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-04-19 21:31:26 +00:00
Code Issues Releases Wiki Activity

Remove if that do nothing

Browse Source
This commit is contained in:
Mathieu Favreau
2025-12-17 19:36:15 +00:00
parent b80950d0ad
commit 12446e8deb
2 changed files with 32 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@
#include "galileo_ephemeris.h"
#include "galileo_iono.h"
#include "galileo_utc_model.h"
#include "glonass_gnav_almanac.h"
#include "glonass_gnav_ephemeris.h"
#include "glonass_gnav_utc_model.h"
#include "gnss_sdr_filesystem.h"
@@ -1734,7 +1733,7 @@ void Rinex_Printer::print_rinex_annotation(const Rtklib_Solver* pvt_solver,
rinex_obs_header(obsFile, gps_ephemeris_iter->second, glonass_gnav_ephemeris_iter->second, rx_time, signal);
if (d_version == 3)
{
rinex_nav_header(navMixFile, pvt_solver->gps_iono, pvt_solver->gps_utc_model, gps_ephemeris_iter->second, pvt_solver->glonass_gnav_utc_model, pvt_solver->glonass_gnav_almanac);
rinex_nav_header(navMixFile, pvt_solver->gps_iono, pvt_solver->gps_utc_model, gps_ephemeris_iter->second, pvt_solver->glonass_gnav_utc_model);
output_navfilename.push_back(navMixfilename);
log_rinex_nav(navMixFile, pvt_solver->gps_ephemeris_map, pvt_solver->glonass_gnav_ephemeris_map);
}
@@ -1752,7 +1751,7 @@ void Rinex_Printer::print_rinex_annotation(const Rtklib_Solver* pvt_solver,
has_gps_cnav_eph && has_glonass_eph)
{
rinex_obs_header(obsFile, gps_cnav_ephemeris_iter->second, glonass_gnav_ephemeris_iter->second, rx_time, signal);
rinex_nav_header(navMixFile, pvt_solver->gps_cnav_iono, pvt_solver->gps_cnav_utc_model, pvt_solver->glonass_gnav_utc_model, pvt_solver->glonass_gnav_almanac);
rinex_nav_header(navMixFile, pvt_solver->gps_cnav_iono, pvt_solver->gps_cnav_utc_model, pvt_solver->glonass_gnav_utc_model);
output_navfilename.push_back(navfilename);
log_rinex_nav(navMixFile, pvt_solver->gps_cnav_ephemeris_map, pvt_solver->glonass_gnav_ephemeris_map);
}
@@ -1760,7 +1759,7 @@ void Rinex_Printer::print_rinex_annotation(const Rtklib_Solver* pvt_solver,
has_galileo_eph && has_glonass_eph)
{
rinex_obs_header(obsFile, galileo_ephemeris_iter->second, glonass_gnav_ephemeris_iter->second, rx_time, signal, signal);
rinex_nav_header(navMixFile, pvt_solver->galileo_iono, pvt_solver->galileo_utc_model, pvt_solver->glonass_gnav_utc_model, pvt_solver->glonass_gnav_almanac);
rinex_nav_header(navMixFile, pvt_solver->galileo_iono, pvt_solver->galileo_utc_model, pvt_solver->glonass_gnav_utc_model);
output_navfilename.push_back(navMixfilename);
log_rinex_nav(navMixFile, pvt_solver->galileo_ephemeris_map, pvt_solver->glonass_gnav_ephemeris_map);
}
@@ -1896,11 +1895,11 @@ void Rinex_Printer::print_rinex_annotation(const Rtklib_Solver* pvt_solver,
{
if (has_glonass_eph)
{
log_rinex_obs(obsFile, glonass_gnav_ephemeris_iter->second, rx_time, gnss_observables_map, signal);
log_rinex_obs(obsFile, glonass_gnav_ephemeris_iter->second, rx_time, gnss_observables_map);
}
if (!d_rinex_header_updated && (pvt_solver->glonass_gnav_utc_model.d_tau_c != 0))
{
update_nav_header(navGloFile, pvt_solver->glonass_gnav_utc_model, pvt_solver->glonass_gnav_almanac);
update_nav_header(navGloFile, pvt_solver->glonass_gnav_utc_model);
d_rinex_header_updated = true;
}
}
@@ -1935,7 +1934,7 @@ void Rinex_Printer::print_rinex_annotation(const Rtklib_Solver* pvt_solver,
if (!d_rinex_header_updated && (pvt_solver->gps_utc_model.A0 != 0))
{
update_obs_header(obsFile, get_leap_second_line(pvt_solver->gps_utc_model, d_version));
update_nav_header(navMixFile, pvt_solver->gps_iono, pvt_solver->gps_utc_model, gps_ephemeris_iter->second, pvt_solver->glonass_gnav_utc_model, pvt_solver->glonass_gnav_almanac);
update_nav_header(navMixFile, pvt_solver->gps_iono, pvt_solver->gps_utc_model, gps_ephemeris_iter->second, pvt_solver->glonass_gnav_utc_model);
d_rinex_header_updated = true; // do not write header anymore
}
}
@@ -1961,7 +1960,7 @@ void Rinex_Printer::print_rinex_annotation(const Rtklib_Solver* pvt_solver,
if (!d_rinex_header_updated && (pvt_solver->galileo_utc_model.A0 != 0))
{
update_obs_header(obsFile, get_leap_second_line(pvt_solver->galileo_utc_model));
update_nav_header(navMixFile, pvt_solver->galileo_iono, pvt_solver->galileo_utc_model, pvt_solver->glonass_gnav_utc_model, pvt_solver->glonass_gnav_almanac);
update_nav_header(navMixFile, pvt_solver->galileo_iono, pvt_solver->galileo_utc_model, pvt_solver->glonass_gnav_utc_model);
d_rinex_header_updated = true; // do not write header anymore
}
}
@@ -1974,7 +1973,7 @@ void Rinex_Printer::print_rinex_annotation(const Rtklib_Solver* pvt_solver,
if (!d_rinex_header_updated && (pvt_solver->gps_cnav_utc_model.A0 != 0))
{
update_obs_header(obsFile, get_leap_second_line(pvt_solver->gps_cnav_utc_model));
update_nav_header(navMixFile, pvt_solver->gps_cnav_iono, pvt_solver->gps_cnav_utc_model, pvt_solver->glonass_gnav_utc_model, pvt_solver->glonass_gnav_almanac);
update_nav_header(navMixFile, pvt_solver->gps_cnav_iono, pvt_solver->gps_cnav_utc_model, pvt_solver->glonass_gnav_utc_model);
d_rinex_header_updated = true; // do not write header anymore
}
}
@@ -2356,12 +2355,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Glonass_Gnav_Utc_M
}
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc_model, const Gps_Ephemeris& eph, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac)
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc_model, const Gps_Ephemeris& eph, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model)
{
if (glonass_gnav_almanac.i_satellite_freq_channel)
{
} // Avoid compiler warning
d_stringVersion = "3.02";
d_version = 3;
@@ -2387,11 +2382,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_Iono& gps_iono
}
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_CNAV_Iono& gps_iono, const Gps_CNAV_Utc_Model& gps_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac)
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_CNAV_Iono& gps_iono, const Gps_CNAV_Utc_Model& gps_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model)
{
if (glonass_gnav_almanac.i_satellite_freq_channel)
{
} // Avoid compiler warning
d_stringVersion = "3.02";
d_version = 3;
@@ -2417,12 +2409,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Gps_CNAV_Iono& gps
}
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac) const
void Rinex_Printer::rinex_nav_header(std::fstream& out, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const
{
if (glonass_gnav_almanac.i_satellite_freq_channel)
{
} // Avoid compiler warning
add_navigation_header_start(out, "M: MIXED", "GNSS", Rinex_Printer::getLocalTime(), d_stringVersion);
// -------- Line ionospheric info 1
@@ -2937,11 +2925,8 @@ void Rinex_Printer::rinex_sbs_header(std::fstream& out) const
}
void Rinex_Printer::update_nav_header(std::fstream& out, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac) const
void Rinex_Printer::update_nav_header(std::fstream& out, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const
{
if (glonass_gnav_almanac.i_satellite_freq_channel)
{
} // Avoid compiler warning
std::vector<std::string> data;
const int64_t pos = out.tellp();
@@ -3352,11 +3337,8 @@ void Rinex_Printer::update_nav_header(std::fstream& out, const Gps_Iono& gps_ion
}
void Rinex_Printer::update_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc_model, const Gps_Ephemeris& eph, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac) const
void Rinex_Printer::update_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc_model, const Gps_Ephemeris& eph, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const
{
if (glonass_gnav_almanac.i_satellite_freq_channel)
{
} // Avoid compiler warning
std::vector<std::string> data;
const int64_t pos = out.tellp();
@@ -3413,11 +3395,8 @@ void Rinex_Printer::update_nav_header(std::fstream& out, const Gps_Iono& gps_ion
}
void Rinex_Printer::update_nav_header(std::fstream& out, const Gps_CNAV_Iono& gps_iono, const Gps_CNAV_Utc_Model& gps_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac) const
void Rinex_Printer::update_nav_header(std::fstream& out, const Gps_CNAV_Iono& gps_iono, const Gps_CNAV_Utc_Model& gps_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const
{
if (glonass_gnav_almanac.i_satellite_freq_channel)
{
} // Avoid compiler warning
std::vector<std::string> data;
const int64_t pos = out.tellp();
@@ -3474,15 +3453,9 @@ void Rinex_Printer::update_nav_header(std::fstream& out, const Gps_CNAV_Iono& gp
}
void Rinex_Printer::update_nav_header(std::fstream& out, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac) const
void Rinex_Printer::update_nav_header(std::fstream& out, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const
{
if (glonass_gnav_almanac.i_satellite_freq_channel)
{
} // Avoid compiler warning
// Avoid compiler warning, there is not time system correction between Galileo and GLONASS
if (galileo_utc_model.A_0G > 0.0)
{
}
// There is not time system correction between Galileo and GLONASS
std::vector<std::string> data;
const int64_t pos = out.tellp();
@@ -4584,17 +4557,12 @@ void Rinex_Printer::update_obs_header(std::fstream& out, const std::string& leap
}
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeris& eph, double obs_time, const std::map<int32_t, Gnss_Synchro>& observables, const std::string& glonass_bands) const
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeris& eph, double obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
{
// RINEX observations timestamps are GPS timestamps.
std::string line;
double int_sec = 0;
// Avoid compiler warning
if (!glonass_bands.empty())
{
}
const boost::posix_time::ptime p_glonass_time = Rinex_Printer::compute_UTC_time(eph, obs_time);
const std::string timestring = boost::posix_time::to_iso_string(p_glonass_time);
// double utc_t = nav_msg.utc_time(nav_msg.sv_clock_correction(obs_time));
@@ -4821,11 +4789,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
}
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& /*glonass_gnav_eph*/, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
{
if (glonass_gnav_eph.d_m > 0.0)
{
} // avoid warning, not needed
std::string line;
// -------- EPOCH record
@@ -5148,11 +5113,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
}
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& /*glonass_gnav_eph*/, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
{
if (glonass_gnav_eph.d_m > 0.0)
{
} // avoid warning, not needed
std::string line;
// -------- EPOCH record
@@ -5377,11 +5339,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
}
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& galileo_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, double galileo_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& galileo_eph, const Glonass_Gnav_Ephemeris& /*glonass_gnav_eph*/, double galileo_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
{
if (glonass_gnav_eph.d_m > 0.0)
{
} // avoid warning, not needed
std::string line;
// double utc_t = nav_msg.utc_time(nav_msg.sv_clock_correction(obs_time));
@@ -5935,11 +5894,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e
}
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<int32_t, Gnss_Synchro>& observables, bool triple_band) const
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<int32_t, Gnss_Synchro>& observables, bool triple_band) const
{
if (eph_cnav.i_0 > 0.0)
{
} // avoid warning, not needed
// RINEX observations timestamps are GPS timestamps.
std::string line;
@@ -6347,11 +6303,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep
}
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_eph, const Galileo_Ephemeris& galileo_eph, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_eph, const Galileo_Ephemeris& /*galileo_eph*/, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
{
if (galileo_eph.ecc > 0.0)
{
} // avoid warning, not needed
std::string line;
// double utc_t = nav_msg.utc_time(nav_msg.sv_clock_correction(obs_time));
@@ -6605,11 +6558,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
}
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& eph, const Galileo_Ephemeris& galileo_eph, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& eph, const Galileo_Ephemeris& /*galileo_eph*/, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables) const
{
if (galileo_eph.ecc > 0.0)
{
} // avoid warning, not needed
std::string line;
// double utc_t = nav_msg.utc_time(nav_msg.sv_clock_correction(obs_time));
@@ -6880,14 +6830,8 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e
}
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_eph, const Gps_CNAV_Ephemeris& gps_cnav_eph, const Galileo_Ephemeris& galileo_eph, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables, bool triple_band) const
void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_eph, const Gps_CNAV_Ephemeris& /*gps_cnav_eph*/, const Galileo_Ephemeris& /*galileo_eph*/, double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables, bool triple_band) const
{
if (galileo_eph.ecc > 0.0)
{
} // avoid warning, not needed
if (gps_cnav_eph.ecc > 0.0)
{
} // avoid warning, not needed
std::string line;
// double utc_t = nav_msg.utc_time(nav_msg.sv_clock_correction(obs_time));

24
src/algorithms/PVT/libs/rinex_printer.h
View File

@@ -367,8 +367,7 @@ private:
void log_rinex_obs(std::fstream& out,
const Glonass_Gnav_Ephemeris& eph,
double obs_time,
const std::map<int32_t, Gnss_Synchro>& observables,
const std::string& glonass_bands = "1C") const;
const std::map<int32_t, Gnss_Synchro>& observables) const;
/*
* Writes Mixed GPS L1 C/A - GLONASS observables into the RINEX file
@@ -460,8 +459,7 @@ private:
void rinex_nav_header(std::fstream& out,
const Galileo_Iono& galileo_iono,
const Galileo_Utc_Model& galileo_utc_model,
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model,
const Glonass_Gnav_Almanac& glonass_gnav_almanac) const;
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const;
/*
* Generates the Mixed (GPS L1 C/A/GLONASS L1, L2) Navigation Data header
@@ -470,8 +468,7 @@ private:
const Gps_Iono& gps_iono,
const Gps_Utc_Model& gps_utc_model,
const Gps_Ephemeris& eph,
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model,
const Glonass_Gnav_Almanac& glonass_gnav_almanac);
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model);
/*
* Generates the Mixed (GPS L2C C/A/GLONASS L1, L2) Navigation Data header
@@ -479,8 +476,7 @@ private:
void rinex_nav_header(std::fstream& out,
const Gps_CNAV_Iono& gps_iono,
const Gps_CNAV_Utc_Model& gps_utc_model,
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model,
const Glonass_Gnav_Almanac& glonass_gnav_almanac);
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model);
/*
* Generates the BDS B1I or B3I Navigation Data header
@@ -678,27 +674,23 @@ private:
const Galileo_Utc_Model& utc_model) const;
void update_nav_header(std::fstream& out,
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model,
const Glonass_Gnav_Almanac& glonass_gnav_almanac) const;
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const;
void update_nav_header(std::fstream& out,
const Gps_Iono& gps_iono,
const Gps_Utc_Model& gps_utc,
const Gps_Ephemeris& eph,
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model,
const Glonass_Gnav_Almanac& glonass_gnav_almanac) const;
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const;
void update_nav_header(std::fstream& out,
const Gps_CNAV_Iono& gps_iono,
const Gps_CNAV_Utc_Model& gps_utc_model,
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model,
const Glonass_Gnav_Almanac& glonass_gnav_almanac) const;
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const;
void update_nav_header(std::fstream& out,
const Galileo_Iono& galileo_iono,
const Galileo_Utc_Model& galileo_utc_model,
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model,
const Glonass_Gnav_Almanac& glonass_gnav_almanac) const;
const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model) const;
void update_nav_header(std::fstream& out,
const Beidou_Dnav_Utc_Model& utc_model,