From e0f8bdd8ccde030ecc6f4f440cb17af980497c8c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 23 Nov 2019 19:10:36 +0100 Subject: [PATCH] Fix initializations --- .../acquisition/adapters/beidou_b1i_pcps_acquisition.cc | 1 + .../acquisition/adapters/beidou_b3i_pcps_acquisition.cc | 1 + .../adapters/galileo_e1_pcps_ambiguous_acquisition.cc | 2 ++ .../acquisition/adapters/galileo_e5a_pcps_acquisition.cc | 1 + .../acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc | 1 + .../acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc | 1 + .../acquisition/adapters/gps_l1_ca_pcps_acquisition.cc | 1 + .../acquisition/adapters/gps_l2_m_pcps_acquisition.cc | 1 + .../acquisition/adapters/gps_l5i_pcps_acquisition.cc | 1 + src/algorithms/acquisition/libs/acq_conf.cc | 6 +++--- 10 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc index a03c25a97..f177dd3a8 100644 --- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc @@ -65,6 +65,7 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition( doppler_step_ = acq_parameters_.doppler_step; fs_in_ = acq_parameters_.fs_in; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; num_codes_ = acq_parameters_.sampled_ms; code_length_ = static_cast(std::floor(static_cast(fs_in_) / (BEIDOU_B1I_CODE_RATE_CPS / BEIDOU_B1I_CODE_LENGTH_CHIPS))); diff --git a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc index 2c603abd5..b41df23af 100644 --- a/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc @@ -62,6 +62,7 @@ BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition( doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; fs_in_ = acq_parameters_.fs_in; num_codes_ = acq_parameters_.sampled_ms; diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc index 41d3f6b39..d26738e3d 100644 --- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc @@ -61,7 +61,9 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition( doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; fs_in_ = acq_parameters_.fs_in; + acquire_pilot_ = configuration->property(role + ".acquire_pilot", "false"); code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS))); vector_length_ = std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2 : 1); diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc index 01ec6a16a..1bf013a3e 100644 --- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc @@ -60,6 +60,7 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; fs_in_ = acq_parameters_.fs_in; acq_pilot_ = configuration_->property(role + ".acquire_pilot", false); diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc index fb632b5d8..8f750ec0b 100644 --- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc @@ -63,6 +63,7 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition( doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; fs_in_ = acq_parameters_.fs_in; code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GLONASS_L1_CA_CODE_RATE_CPS / GLONASS_L1_CA_CODE_LENGTH_CHIPS))); diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc index 625d9ab18..d198e526f 100644 --- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc @@ -62,6 +62,7 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition( doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; fs_in_ = acq_parameters_.fs_in; code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GLONASS_L2_CA_CODE_RATE_CPS / GLONASS_L2_CA_CODE_LENGTH_CHIPS))); diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc index c24a24134..3b7fa3cf9 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc @@ -67,6 +67,7 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition( doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GPS_L1_CA_CODE_RATE_CPS / GPS_L1_CA_CODE_LENGTH_CHIPS))); vector_length_ = std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2 : 1); diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc index 4502cebf6..673067b19 100644 --- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc @@ -63,6 +63,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition( doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; fs_in_ = acq_parameters_.fs_in; code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GPS_L2_M_CODE_RATE_CPS / GPS_L2_M_CODE_LENGTH_CHIPS))); diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc index bd12656cd..b712e58b6 100644 --- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc +++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc @@ -64,6 +64,7 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition( doppler_max_ = acq_parameters_.doppler_max; doppler_step_ = acq_parameters_.doppler_step; item_type_ = acq_parameters_.item_type; + item_size_ = acq_parameters_.it_size; code_length_ = static_cast(std::floor(static_cast(acq_parameters_.resampled_fs) / (GPS_L5I_CODE_RATE_CPS / GPS_L5I_CODE_LENGTH_CHIPS))); vector_length_ = std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2 : 1); diff --git a/src/algorithms/acquisition/libs/acq_conf.cc b/src/algorithms/acquisition/libs/acq_conf.cc index 20bfc909c..8b5d4faec 100644 --- a/src/algorithms/acquisition/libs/acq_conf.cc +++ b/src/algorithms/acquisition/libs/acq_conf.cc @@ -44,6 +44,7 @@ Acq_Conf::Acq_Conf() chips_per_second = 1023000; doppler_max = 5000; doppler_min = -5000; + doppler_step = 0.0; num_doppler_bins_step2 = 4U; doppler_step2 = 125.0; pfa = 0.0; @@ -84,8 +85,7 @@ void Acq_Conf::SetFromConfiguration(ConfigurationInterface *configuration, doppler_max = configuration->property(role + ".doppler_max", doppler_max); sampled_ms = configuration->property(role + ".coherent_integration_time_ms", sampled_ms); bit_transition_flag = configuration->property(role + ".bit_transition_flag", bit_transition_flag); - use_CFAR_algorithm_flag = configuration->property(role + ".use_CFAR_algorithm", use_CFAR_algorithm_flag); //will be false in future versions - //acquire_pilot = configuration->property(role + ".acquire_pilot", acquire_pilot); //will be true in future versions + use_CFAR_algorithm_flag = configuration->property(role + ".use_CFAR_algorithm", use_CFAR_algorithm_flag); // will be false in future versions max_dwells = configuration->property(role + ".max_dwells", max_dwells); dump = configuration->property(role + ".dump", dump); dump_channel = configuration->property(role + ".dump_channel", dump_channel); @@ -146,7 +146,7 @@ void Acq_Conf::ConfigureAutomaticResampler(double opt_freq) resampler_ratio = decimation; resampled_fs = fs_in / static_cast(resampler_ratio); } - //--- Find number of samples per spreading code ------------------------- + // --- Find number of samples per spreading code ------------------- SetDerivedParams(); } }