From 4375d0a051af65897c89716e6851fe1f6652f690 Mon Sep 17 00:00:00 2001 From: Antonio Ramos Date: Mon, 17 Sep 2018 19:19:19 +0200 Subject: [PATCH] Clean code --- ...2f_high_dynamic_rotator_dot_prod_32fc_xn.h | 19 ++++++++++--------- .../adapters/gps_l1_ca_dll_pll_tracking.cc | 6 +++--- .../gnuradio_blocks/dll_pll_veml_tracking.cc | 1 - .../libs/cpu_multicorrelator_real_codes.cc | 1 - 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h index 148fda2c3..e20d229e3 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn.h @@ -3,7 +3,7 @@ * \brief VOLK_GNSSSDR kernel: multiplies N complex (32-bit float per component) vectors * by a common vector, phase rotated and accumulates the results in N float complex outputs. * \authors * * VOLK_GNSSSDR kernel that multiplies N 32 bits complex vectors by a common vector, which is @@ -37,7 +37,7 @@ */ /*! - * \page volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn + * \page volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn * * \b Overview * @@ -48,16 +48,17 @@ * * Dispatcher Prototype * \code - * void volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn(lv_32fc_t* result, const lv_32fc_t* in_common, const lv_32fc_t phase_inc, lv_32fc_t* phase, const float** in_a, int num_a_vectors, unsigned int num_points); + * void volk_gnsssdr_32fc_32f_high_dynamic_rotator_dot_prod_32fc_xn(lv_32fc_t* result, const lv_32fc_t* in_common, const lv_32fc_t phase_inc, const lv_32fc_t phase_inc_rate, lv_32fc_t* phase, const float** in_a, int num_a_vectors, unsigned int num_points); * \endcode * * \b Inputs - * \li in_common: Pointer to one of the vectors to be rotated, multiplied and accumulated (reference vector). - * \li phase_inc: Phase increment = lv_cmake(cos(phase_step_rad), sin(phase_step_rad)) - * \li phase: Initial phase = lv_cmake(cos(initial_phase_rad), sin(initial_phase_rad)) - * \li in_a: Pointer to an array of pointers to multiple vectors to be multiplied and accumulated. - * \li num_a_vectors: Number of vectors to be multiplied by the reference vector and accumulated. - * \li num_points: Number of complex values to be multiplied together, accumulated and stored into \p result. + * \li in_common: Pointer to one of the vectors to be rotated, multiplied and accumulated (reference vector). + * \li phase_inc: Phase increment = lv_cmake(cos(phase_step_rad), sin(phase_step_rad)) + * \li phase_inc_rate: Phase increment rate = lv_cmake(cos(phase_step_rate_rad), sin(phase_step_rate_rad)) + * \li phase: Initial phase = lv_cmake(cos(initial_phase_rad), sin(initial_phase_rad)) + * \li in_a: Pointer to an array of pointers to multiple vectors to be multiplied and accumulated. + * \li num_a_vectors: Number of vectors to be multiplied by the reference vector and accumulated. + * \li num_points: Number of complex values to be multiplied together, accumulated and stored into \p result. * * \b Outputs * \li phase: Final phase. diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc index 35ebe1aeb..b9a8b2c6e 100644 --- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc +++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc @@ -58,14 +58,14 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking( int fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated); trk_param.fs_in = fs_in; trk_param.high_dyn = configuration->property(role + ".high_dyn", false); - if (configuration->property(role + ".cp_smoother_length", 10) < 1) + if (configuration->property(role + ".smoother_length", 10) < 1) { trk_param.smoother_length = 1; - std::cout << TEXT_RED << "WARNING: GPS L1 C/A. cp_smoother_length must be bigger than 0. It has been set to 1" << TEXT_RESET << std::endl; + std::cout << TEXT_RED << "WARNING: GPS L1 C/A. smoother_length must be bigger than 0. It has been set to 1" << TEXT_RESET << std::endl; } else { - trk_param.smoother_length = configuration->property(role + ".cp_smoother_length", 10); + trk_param.smoother_length = configuration->property(role + ".smoother_length", 10); } bool dump = configuration->property(role + ".dump", false); trk_param.dump = dump; diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc index 4bc1b065d..068cb9534 100755 --- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc +++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc @@ -719,7 +719,6 @@ void dll_pll_veml_tracking::do_correlation_step(const gr_complex *input_samples) // ################# CARRIER WIPEOFF AND CORRELATORS ############################## // perform carrier wipe-off and compute Early, Prompt and Late correlation multicorrelator_cpu.set_input_output_vectors(d_correlator_outs, input_samples); - //float tmp_f = d_rem_carr_phase_rad; multicorrelator_cpu.Carrier_wipeoff_multicorrelator_resampler( d_rem_carr_phase_rad, d_carrier_phase_step_rad, d_carrier_phase_rate_step_rad, diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc index cf5c35074..f23537fad 100644 --- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc +++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc @@ -148,7 +148,6 @@ bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler( { volk_gnsssdr_32fc_32f_rotator_dot_prod_32fc_xn(d_corr_out, d_sig_in, std::exp(lv_32fc_t(0.0, -phase_step_rad)), phase_offset_as_complex, const_cast(d_local_codes_resampled), d_n_correlators, signal_length_samples); } - //rem_carrier_phase_in_rad = std::arg(std::conj(phase_offset_as_complex[0])); return true; } // Overload Carrier_wipeoff_multicorrelator_resampler to ensure back compatibility