diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.cc b/src/algorithms/observables/adapters/galileo_e1_observables.cc index e8f7218b0..148cacc53 100644 --- a/src/algorithms/observables/adapters/galileo_e1_observables.cc +++ b/src/algorithms/observables/adapters/galileo_e1_observables.cc @@ -44,15 +44,11 @@ GalileoE1Observables::GalileoE1Observables(ConfigurationInterface* configuration in_streams_(in_streams), out_streams_(out_streams) { - int output_rate_ms; - output_rate_ms = configuration->property(role + ".output_rate_ms", 500); std::string default_dump_filename = "./observables.dat"; DLOG(INFO) << "role " << role; - bool flag_averaging; - flag_averaging = configuration->property(role + ".flag_averaging", false); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); - observables_ = galileo_e1_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging); + observables_ = galileo_e1_make_observables_cc(in_streams_, dump_, dump_filename_); DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")"; } diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc index c5c0b17ef..6b176d006 100644 --- a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc +++ b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc @@ -44,15 +44,11 @@ GpsL1CaObservables::GpsL1CaObservables(ConfigurationInterface* configuration, in_streams_(in_streams), out_streams_(out_streams) { - int output_rate_ms; - output_rate_ms = configuration->property(role + ".output_rate_ms", 500); std::string default_dump_filename = "./observables.dat"; DLOG(INFO) << "role " << role; - bool flag_averaging; - flag_averaging = configuration->property(role + ".flag_averaging", false); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); - observables_ = gps_l1_ca_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging); + observables_ = gps_l1_ca_make_observables_cc(in_streams_, dump_, dump_filename_); DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")"; } diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc index 30832f771..d3a4d9899 100644 --- a/src/algorithms/observables/adapters/hybrid_observables.cc +++ b/src/algorithms/observables/adapters/hybrid_observables.cc @@ -44,15 +44,11 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration, in_streams_(in_streams), out_streams_(out_streams) { - int output_rate_ms; - output_rate_ms = configuration->property(role + ".output_rate_ms", 500); std::string default_dump_filename = "./observables.dat"; DLOG(INFO) << "role " << role; - bool flag_averaging; - flag_averaging = configuration->property(role + ".flag_averaging", false); dump_ = configuration->property(role + ".dump", false); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); - observables_ = hybrid_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging); + observables_ = hybrid_make_observables_cc(in_streams_, dump_, dump_filename_); DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")"; } diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc index 8907f64fa..21bae018b 100644 --- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc +++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc @@ -50,22 +50,20 @@ using google::LogMessage; galileo_e1_observables_cc_sptr -galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) +galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename) { - return galileo_e1_observables_cc_sptr(new galileo_e1_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging)); + return galileo_e1_observables_cc_sptr(new galileo_e1_observables_cc(nchannels, dump, dump_filename)); } -galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) : +galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename) : gr::block("galileo_e1_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro))) { // initialize internal vars d_dump = dump; d_nchannels = nchannels; - d_output_rate_ms = output_rate_ms; d_dump_filename = dump_filename; - d_flag_averaging = flag_averaging; for (unsigned int i = 0; i < d_nchannels; i++) { diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h index fcbc17745..1516ea239 100644 --- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h +++ b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h @@ -44,7 +44,7 @@ class galileo_e1_observables_cc; typedef boost::shared_ptr galileo_e1_observables_cc_sptr; galileo_e1_observables_cc_sptr -galileo_e1_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); +galileo_e1_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename); /*! * \brief This class implements a block that computes Galileo observables @@ -59,8 +59,8 @@ public: private: friend galileo_e1_observables_cc_sptr - galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); - galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); + galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename); + galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename); //Tracking observable history std::vector> d_acc_carrier_phase_queue_rads; @@ -69,9 +69,7 @@ private: // class private vars bool d_dump; - bool d_flag_averaging; unsigned int d_nchannels; - int d_output_rate_ms; std::string d_dump_filename; std::ofstream d_dump_file; }; diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc index c57f5d0d7..3dfda72a5 100644 --- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc +++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc @@ -47,22 +47,20 @@ using google::LogMessage; gps_l1_ca_observables_cc_sptr -gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) +gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename) { - return gps_l1_ca_observables_cc_sptr(new gps_l1_ca_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging)); + return gps_l1_ca_observables_cc_sptr(new gps_l1_ca_observables_cc(nchannels, dump, dump_filename)); } -gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) : +gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename) : gr::block("gps_l1_ca_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro))) { // initialize internal vars d_dump = dump; d_nchannels = nchannels; - d_output_rate_ms = output_rate_ms; d_dump_filename = dump_filename; - d_flag_averaging = flag_averaging; for (unsigned int i = 0; i < d_nchannels; i++) { diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h index 5d8eb1bf7..30670efb5 100644 --- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h +++ b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h @@ -44,7 +44,7 @@ class gps_l1_ca_observables_cc; typedef boost::shared_ptr gps_l1_ca_observables_cc_sptr; gps_l1_ca_observables_cc_sptr -gps_l1_ca_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); +gps_l1_ca_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename); /*! * \brief This class implements a block that computes GPS L1 C/A observables @@ -59,8 +59,8 @@ public: private: friend gps_l1_ca_observables_cc_sptr - gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); - gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); + gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename); + gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename); //Tracking observable history @@ -70,9 +70,7 @@ private: // class private vars bool d_dump; - bool d_flag_averaging; unsigned int d_nchannels; - int d_output_rate_ms; std::string d_dump_filename; std::ofstream d_dump_file; }; diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc index e67239f90..6a68032b1 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc @@ -48,22 +48,20 @@ using google::LogMessage; hybrid_observables_cc_sptr -hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) +hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename) { - return hybrid_observables_cc_sptr(new hybrid_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging)); + return hybrid_observables_cc_sptr(new hybrid_observables_cc(nchannels, dump, dump_filename)); } -hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) : +hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename) : gr::block("hybrid_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro))) { // initialize internal vars d_dump = dump; d_nchannels = nchannels; - d_output_rate_ms = output_rate_ms; d_dump_filename = dump_filename; - d_flag_averaging = flag_averaging; // ############# ENABLE DATA FILE LOG ################# if (d_dump == true) diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h index 001f3e735..6ff284627 100644 --- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h +++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h @@ -43,7 +43,7 @@ class hybrid_observables_cc; typedef boost::shared_ptr hybrid_observables_cc_sptr; hybrid_observables_cc_sptr -hybrid_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); +hybrid_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename); /*! * \brief This class implements a block that computes Galileo observables @@ -57,14 +57,12 @@ public: private: friend hybrid_observables_cc_sptr - hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); - hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); + hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename); + hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename); // class private vars bool d_dump; - bool d_flag_averaging; unsigned int d_nchannels; - int d_output_rate_ms; std::string d_dump_filename; std::ofstream d_dump_file; };