From 7d3a6c929c198b4e7c67d1da170775b5a6d33dcb Mon Sep 17 00:00:00 2001 From: Dave Rainwater Date: Wed, 18 Nov 2020 15:38:58 -0600 Subject: [PATCH] [ci-skip] Clean up commented-out example code. --- core/lib/ORD/ord.cpp | 13 ++++++++----- core/lib/ORD/ord.hpp | 14 +++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/core/lib/ORD/ord.cpp b/core/lib/ORD/ord.cpp index 27dbefa50..9eb2aaacb 100644 --- a/core/lib/ORD/ord.cpp +++ b/core/lib/ORD/ord.cpp @@ -278,12 +278,15 @@ double TroposphereCorrection(const gpstk::TropModel& tropModel, * Users should construct an ORD algorithm based on their data and use case. * double calculate_ord(const std::vector& bands, - const std::vector& pseudoranges, const gpstk::Position& rx_loc, - const gpstk::SatID& sat_id, const gpstk::CommonTime& transmit_time, + const std::vector& pseudoranges, + const gpstk::Position& rx_loc, + const gpstk::SatID& sat_id, + const gpstk::CommonTime& transmit_time, const gpstk::CommonTime& receive_time, const gpstk::IonoModelStore& iono_model, const gpstk::TropModel& trop_model, - const gpstk::XvtStore& ephemeris, int range_method) { + const gpstk::XvtStore& ephemeris, + int range_method) { double ps_range = IonosphereFreeRange(bands, pseudoranges); gpstk::Xvt sv_xvt; @@ -316,8 +319,8 @@ double calculate_ord(const std::vector& bands, range += TroposphereCorrection(trop_model, rx_loc, sv_xvt); // apply ionosphere model correction -- GPS only (this is Klobuchar) - range += IonosphereModelCorrection(iono_model, receive_time, - bands[0], + range += IonosphereModelCorrection(iono_model, + receive_time, bands[0], rx_loc, sv_xvt); return ps_range - range; diff --git a/core/lib/ORD/ord.hpp b/core/lib/ORD/ord.hpp index 1855e4791..c080358c4 100644 --- a/core/lib/ORD/ord.hpp +++ b/core/lib/ORD/ord.hpp @@ -167,7 +167,7 @@ double TroposphereCorrection(const gpstk::TropModel& trop_model, /// E.g., if dual-band, there should be no additional ionosphere correction applied. /// Users should construct an ORD based on their data and use case. /// Parameters: -/// @params frequencies -- Signal frequencies (one or two, for single-band/dual-band). +/// @params bands -- Signal bands (one or two enums, for single-band/dual-band). /// @params pseudoranges -- Pseudorange values, corresponding to frequency array (one or two). /// @params trop_model -- Class that encapsulates ionospheric models. /// @params rx_loc -- The location of the receiver. @@ -177,15 +177,19 @@ double TroposphereCorrection(const gpstk::TropModel& trop_model, /// @params iono_model -- Class that encapsulates ionospheric models. /// @params trop_model -- Class that encapsulates troposphere models. /// @params ephemeris -- The ephemeris to query against. +/// @params range_method -- One of four raw range methods, depending on what data is available. /// @returns Observed range deviation from 1st pseudorange. /* -double calculate_ord(const std::vector& frequencies, - const std::vector& pseudoranges, const gpstk::Position& rx_loc, - const gpstk::SatID& sat_id, const gpstk::CommonTime& transmit_time, +double calculate_ord(const std::vector& bands, + const std::vector& pseudoranges, + const gpstk::Position& rx_loc, + const gpstk::SatID& sat_id, + const gpstk::CommonTime& transmit_time, const gpstk::CommonTime& receive_time, const gpstk::IonoModelStore& iono_model, const gpstk::TropModel& trop_model, - const gpstk::XvtStore& ephemeris, int range_method); + const gpstk::XvtStore& ephemeris, + int range_method); */ } // namespace ord