Make the adapters take the configuration pointer as const

src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc

@@ -40,16 +40,15 @@ namespace own = gsl;
 
 
 BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, BEIDOU_B1I_CODE_RATE_CPS, 10e6);
+    acq_parameters_.SetFromConfiguration(configuration, role, BEIDOU_B1I_CODE_RATE_CPS, 10e6);
 
     LOG(INFO) << "role " << role;
 

src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h

@@ -44,7 +44,7 @@ class ConfigurationInterface;
 class BeidouB1iPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    BeidouB1iPcpsAcquisition(ConfigurationInterface* configuration,
+    BeidouB1iPcpsAcquisition(const ConfigurationInterface* configuration,
         const std::string& role, unsigned int in_streams,
         unsigned int out_streams);
 
@@ -155,7 +155,6 @@ private:
     gr::blocks::float_to_complex::sptr float_to_complex_;
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string role_;

src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.cc

@@ -38,16 +38,15 @@ namespace own = gsl;
 using google::LogMessage;
 
 BeidouB3iPcpsAcquisition::BeidouB3iPcpsAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, BEIDOU_B3I_CODE_RATE_CPS, 100e6);
+    acq_parameters_.SetFromConfiguration(configuration, role, BEIDOU_B3I_CODE_RATE_CPS, 100e6);
 
     LOG(INFO) << "role " << role;
 

src/algorithms/acquisition/adapters/beidou_b3i_pcps_acquisition.h

@@ -43,7 +43,7 @@ class ConfigurationInterface;
 class BeidouB3iPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    BeidouB3iPcpsAcquisition(ConfigurationInterface* configuration,
+    BeidouB3iPcpsAcquisition(const ConfigurationInterface* configuration,
         const std::string& role, unsigned int in_streams,
         unsigned int out_streams);
 
@@ -154,7 +154,6 @@ private:
     gr::blocks::float_to_complex::sptr float_to_complex_;
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string role_;

src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc

@@ -36,7 +36,7 @@ namespace own = gsl;
 #endif
 
 GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.h

@@ -38,7 +38,7 @@ class ConfigurationInterface;
 class GalileoE1Pcps8msAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
-    GalileoE1Pcps8msAmbiguousAcquisition(ConfigurationInterface* configuration,
+    GalileoE1Pcps8msAmbiguousAcquisition(const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -139,29 +139,30 @@ public:
 
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+
+    const ConfigurationInterface* configuration_;
     galileo_pcps_8ms_acquisition_cc_sptr acquisition_cc_;
     gr::blocks::stream_to_vector::sptr stream_to_vector_;
-    size_t item_size_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_;
+    Gnss_Synchro* gnss_synchro_;
     std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+    int64_t fs_in_;
+    size_t item_size_;
+    float threshold_;
     unsigned int vector_length_;
     unsigned int code_length_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GALILEO_E1_PCPS_8MS_AMBIGUOUS_ACQUISITION_H

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -37,7 +37,7 @@ namespace own = gsl;
 #endif
 
 GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h

@@ -41,7 +41,8 @@ class ConfigurationInterface;
 class GalileoE1PcpsAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
-    GalileoE1PcpsAmbiguousAcquisition(ConfigurationInterface* configuration,
+    GalileoE1PcpsAmbiguousAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -158,7 +159,7 @@ private:
     gr::blocks::float_to_complex::sptr float_to_complex_;
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
+    const ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc

@@ -34,7 +34,7 @@
 #include <complex>    // for complex
 
 GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
@@ -42,33 +42,32 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
                                 out_streams_(out_streams)
 {
     pcpsconf_fpga_t acq_parameters;
-    configuration_ = configuration;
 
     std::string default_dump_filename = "./data/acquisition.dat";
 
     DLOG(INFO) << "role " << role;
 
-    int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 4000000);
-    int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
+    int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 4000000);
+    int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
 
-    acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false);
+    acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false);
     DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite;
 
-    uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 4);
+    uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 4);
     acq_parameters.downsampling_factor = downsampling_factor;
 
     fs_in = fs_in / downsampling_factor;
 
     acq_parameters.fs_in = fs_in;
 
-    doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
+    doppler_max_ = configuration->property(role + ".doppler_max", 5000);
     if (FLAGS_doppler_max != 0)
         {
             doppler_max_ = FLAGS_doppler_max;
         }
     acq_parameters.doppler_max = doppler_max_;
 
-    acquire_pilot_ = configuration_->property(role + ".acquire_pilot", false);  // could be true in future versions
+    acquire_pilot_ = configuration->property(role + ".acquire_pilot", false);  // could be true in future versions
 
     // Find number of samples per spreading code (4 ms)
     auto code_length = static_cast<uint32_t>(std::round(static_cast<double>(fs_in) / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
@@ -77,11 +76,11 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
     // The FPGA can only use FFT lengths that are a power of two.
     float nbits = ceilf(log2f(static_cast<float>(code_length) * 2.0));
     uint32_t nsamples_total = pow(2, nbits);
-    uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 0);
+    uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 0);
 
     acq_parameters.select_queue_Fpga = select_queue_Fpga;
     std::string default_device_name = "/dev/uio0";
-    std::string device_name = configuration_->property(role + ".devicename", default_device_name);
+    std::string device_name = configuration->property(role + ".devicename", default_device_name);
     acq_parameters.device_name = device_name;
     acq_parameters.samples_per_code = nsamples_total;
     acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_CPS) * static_cast<float>(fs_in)));
@@ -159,12 +158,12 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
 
     acq_parameters.all_fft_codes = d_all_fft_codes_.data();
 
-    acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4);
-    acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0);
-    acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false);
-    acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2);
+    acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4);
+    acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0);
+    acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false);
+    acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2);
     // reference for the FPGA FFT-IFFT attenuation factor
-    acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 13);
+    acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 13);
 
     acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters);
 

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.h

@@ -42,7 +42,8 @@ public:
     /*!
      * \brief Constructor
      */
-    GalileoE1PcpsAmbiguousAcquisitionFpga(ConfigurationInterface* configuration,
+    GalileoE1PcpsAmbiguousAcquisitionFpga(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -189,7 +190,6 @@ private:
     std::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     std::weak_ptr<ChannelFsm> channel_fsm_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     std::string dump_filename_;
     std::string role_;
     int32_t doppler_center_;

src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc

@@ -28,7 +28,7 @@
 
 
 GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.h

@@ -38,7 +38,8 @@ class ConfigurationInterface;
 class GalileoE1PcpsCccwsrAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
-    GalileoE1PcpsCccwsrAmbiguousAcquisition(ConfigurationInterface* configuration,
+    GalileoE1PcpsCccwsrAmbiguousAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -138,30 +139,31 @@ public:
     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+
+    const ConfigurationInterface* configuration_;
     pcps_cccwsr_acquisition_cc_sptr acquisition_cc_;
     gr::blocks::stream_to_vector::sptr stream_to_vector_;
-    size_t item_size_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_data_;
+    std::vector<std::complex<float>> code_pilot_;
     std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+    Gnss_Synchro* gnss_synchro_;
+    int64_t fs_in_;
+    size_t item_size_;
+    float threshold_;
     unsigned int vector_length_;
     unsigned int code_length_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_data_;
-    std::vector<std::complex<float>> code_pilot_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GALILEO_E1_PCPS_CCCWSR_AMBIGUOUS_ACQUISITION_H

src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc

@@ -36,7 +36,7 @@ namespace own = gsl;
 #endif
 
 GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.h

@@ -39,7 +39,8 @@ class ConfigurationInterface;
 class GalileoE1PcpsQuickSyncAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
-    GalileoE1PcpsQuickSyncAmbiguousAcquisition(ConfigurationInterface* configuration,
+    GalileoE1PcpsQuickSyncAmbiguousAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -141,31 +142,32 @@ public:
     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+
+    const ConfigurationInterface* configuration_;
     pcps_quicksync_acquisition_cc_sptr acquisition_cc_;
     gr::blocks::stream_to_vector::sptr stream_to_vector_;
-    size_t item_size_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_;
     std::string item_type_;
+    std::string role_;
+    std::string dump_filename_;
+    Gnss_Synchro* gnss_synchro_;
+    int64_t fs_in_;
+    size_t item_size_;
+    float threshold_;
     unsigned int vector_length_;
     unsigned int code_length_;
-    bool bit_transition_flag_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int max_dwells_;
     unsigned int folding_factor_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool bit_transition_flag_;
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GALILEO_E1_PCPS_QUICKSYNC_AMBIGUOUS_ACQUISITION_H

src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc

@@ -36,7 +36,7 @@ namespace own = gsl;
 #endif
 
 GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.h

@@ -38,7 +38,8 @@ class ConfigurationInterface;
 class GalileoE1PcpsTongAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
-    GalileoE1PcpsTongAmbiguousAcquisition(ConfigurationInterface* configuration,
+    GalileoE1PcpsTongAmbiguousAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -140,31 +141,31 @@ public:
     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+    const ConfigurationInterface* configuration_;
     pcps_tong_acquisition_cc_sptr acquisition_cc_;
     gr::blocks::stream_to_vector::sptr stream_to_vector_;
-    size_t item_size_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_;
+    Gnss_Synchro* gnss_synchro_;
     std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+    int64_t fs_in_;
+    size_t item_size_;
+    float threshold_;
     unsigned int vector_length_;
     unsigned int code_length_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int tong_init_val_;
     unsigned int tong_max_val_;
     unsigned int tong_max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GALILEO_E1_PCPS_TONG_AMBIGUOUS_ACQUISITION_H

src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc

@@ -42,7 +42,7 @@ namespace own = gsl;
 #endif
 
 GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h

@@ -39,7 +39,7 @@ class ConfigurationInterface;
 class GalileoE5aNoncoherentIQAcquisitionCaf : public AcquisitionInterface
 {
 public:
-    GalileoE5aNoncoherentIQAcquisitionCaf(ConfigurationInterface* configuration,
+    GalileoE5aNoncoherentIQAcquisitionCaf(const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -144,33 +144,34 @@ public:
     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+
+    const ConfigurationInterface* configuration_;
     galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr acquisition_cc_;
-    size_t item_size_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> codeI_;
+    std::vector<std::complex<float>> codeQ_;
     std::string item_type_;
+    std::string role_;
+    std::string dump_filename_;
+    Gnss_Synchro* gnss_synchro_;
+    int64_t fs_in_;
+    size_t item_size_;
+    float threshold_;
+    int Zero_padding;
+    int CAF_window_hz_;
     unsigned int vector_length_;
     unsigned int code_length_;
-    bool bit_transition_flag_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    int Zero_padding;
-    int CAF_window_hz_;
-    std::vector<std::complex<float>> codeI_;
-    std::vector<std::complex<float>> codeQ_;
-    bool both_signal_components;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool bit_transition_flag_;
+    bool both_signal_components;
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc

@@ -35,16 +35,16 @@ namespace own = std;
 namespace own = gsl;
 #endif
 
-GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* configuration,
+GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, GALILEO_E5A_CODE_CHIP_RATE_CPS, GALILEO_E5A_OPT_ACQ_FS_SPS);
+    acq_parameters_.SetFromConfiguration(configuration, role, GALILEO_E5A_CODE_CHIP_RATE_CPS, GALILEO_E5A_OPT_ACQ_FS_SPS);
 
     DLOG(INFO) << "Role " << role;
 
@@ -58,8 +58,8 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
     item_size_ = acq_parameters_.it_size;
     fs_in_ = acq_parameters_.fs_in;
 
-    acq_pilot_ = configuration_->property(role + ".acquire_pilot", false);
-    acq_iq_ = configuration_->property(role + ".acquire_iq", false);
+    acq_pilot_ = configuration->property(role + ".acquire_pilot", false);
+    acq_iq_ = configuration->property(role + ".acquire_iq", false);
     if (acq_iq_)
         {
             acq_pilot_ = false;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.h

@@ -33,7 +33,8 @@ class ConfigurationInterface;
 class GalileoE5aPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    GalileoE5aPcpsAcquisition(ConfigurationInterface* configuration,
+    GalileoE5aPcpsAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -147,7 +148,6 @@ private:
     std::vector<std::complex<float>> code_;
     std::weak_ptr<ChannelFsm> channel_fsm_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc

@@ -33,7 +33,8 @@
 #include <cmath>      // for abs, pow, floor
 #include <complex>    // for complex
 
-GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration,
+GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
@@ -41,32 +42,31 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
                                 out_streams_(out_streams)
 {
     pcpsconf_fpga_t acq_parameters;
-    configuration_ = configuration;
     std::string default_dump_filename = "../data/acquisition.dat";
 
     DLOG(INFO) << "Role " << role;
 
-    int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 32000000);
-    int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
+    int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 32000000);
+    int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
 
-    acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false);
+    acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false);
     DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite;
 
-    uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 1);
+    uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 1);
     acq_parameters.downsampling_factor = downsampling_factor;
     fs_in = fs_in / downsampling_factor;
 
     acq_parameters.fs_in = fs_in;
 
-    doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
+    doppler_max_ = configuration->property(role + ".doppler_max", 5000);
     if (FLAGS_doppler_max != 0)
         {
             doppler_max_ = FLAGS_doppler_max;
         }
     acq_parameters.doppler_max = doppler_max_;
 
-    acq_pilot_ = configuration_->property(role + ".acquire_pilot", false);
-    acq_iq_ = configuration_->property(role + ".acquire_iq", false);
+    acq_pilot_ = configuration->property(role + ".acquire_pilot", false);
+    acq_iq_ = configuration->property(role + ".acquire_iq", false);
     if (acq_iq_)
         {
             acq_pilot_ = false;
@@ -78,10 +78,10 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
     // The FPGA can only use FFT lengths that are a power of two.
     float nbits = ceilf(log2f(static_cast<float>(code_length) * 2.0));
     uint32_t nsamples_total = pow(2, nbits);
-    uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 1);
+    uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 1);
     acq_parameters.select_queue_Fpga = select_queue_Fpga;
     std::string default_device_name = "/dev/uio0";
-    std::string device_name = configuration_->property(role + ".devicename", default_device_name);
+    std::string device_name = configuration->property(role + ".devicename", default_device_name);
     acq_parameters.device_name = device_name;
     acq_parameters.samples_per_code = nsamples_total;
 
@@ -163,12 +163,12 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
     acq_parameters.all_fft_codes = d_all_fft_codes_.data();
 
     // reference for the FPGA FFT-IFFT attenuation factor
-    acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 13);
+    acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 13);
 
-    acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4);
-    acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0);
-    acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false);
-    acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2);
+    acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4);
+    acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0);
+    acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false);
+    acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2);
     acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters);
 
     channel_ = 0;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.h

@@ -42,7 +42,8 @@ public:
     /*!
      * \brief Constructor
      */
-    GalileoE5aPcpsAcquisitionFpga(ConfigurationInterface* configuration,
+    GalileoE5aPcpsAcquisitionFpga(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -196,7 +197,6 @@ private:
     std::weak_ptr<ChannelFsm> channel_fsm_;
     std::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     std::string role_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc

@@ -38,16 +38,15 @@ namespace own = gsl;
 #endif
 
 GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, GLONASS_L1_CA_CODE_RATE_CPS, 100e6);
+    acq_parameters_.SetFromConfiguration(configuration, role, GLONASS_L1_CA_CODE_RATE_CPS, 100e6);
 
     DLOG(INFO) << "role " << role;
 

src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.h

@@ -42,7 +42,8 @@ class ConfigurationInterface;
 class GlonassL1CaPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    GlonassL1CaPcpsAcquisition(ConfigurationInterface* configuration,
+    GlonassL1CaPcpsAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -151,7 +152,6 @@ private:
     gr::blocks::float_to_complex::sptr float_to_complex_;
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc

@@ -37,16 +37,15 @@ namespace own = gsl;
 #endif
 
 GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, GLONASS_L2_CA_CODE_RATE_CPS, 100e6);
+    acq_parameters_.SetFromConfiguration(configuration, role, GLONASS_L2_CA_CODE_RATE_CPS, 100e6);
 
     DLOG(INFO) << "role " << role;
 

src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.h

@@ -41,7 +41,8 @@ class ConfigurationInterface;
 class GlonassL2CaPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    GlonassL2CaPcpsAcquisition(ConfigurationInterface* configuration,
+    GlonassL2CaPcpsAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -150,7 +151,6 @@ private:
     gr::blocks::float_to_complex::sptr float_to_complex_;
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc

@@ -40,16 +40,15 @@ namespace own = gsl;
 #endif
 
 GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, GPS_L1_CA_CODE_RATE_CPS, GPS_L1_CA_OPT_ACQ_FS_SPS);
+    acq_parameters_.SetFromConfiguration(configuration, role, GPS_L1_CA_CODE_RATE_CPS, GPS_L1_CA_OPT_ACQ_FS_SPS);
 
     DLOG(INFO) << "role " << role;
 

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h

@@ -45,7 +45,8 @@ class ConfigurationInterface;
 class GpsL1CaPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    GpsL1CaPcpsAcquisition(ConfigurationInterface* configuration,
+    GpsL1CaPcpsAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -162,7 +163,6 @@ private:
     gr::blocks::float_to_complex::sptr float_to_complex_;
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc

@@ -31,7 +31,7 @@
 
 
 GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.h

@@ -45,7 +45,7 @@ class ConfigurationInterface;
 class GpsL1CaPcpsAcquisitionFineDoppler : public AcquisitionInterface
 {
 public:
-    GpsL1CaPcpsAcquisitionFineDoppler(ConfigurationInterface* configuration,
+    GpsL1CaPcpsAcquisitionFineDoppler(const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -152,24 +152,24 @@ public:
 
 private:
     pcps_acquisition_fine_doppler_cc_sptr acquisition_cc_;
-    size_t item_size_;
-    std::string item_type_;
-    unsigned int vector_length_;
-    unsigned int channel_;
     std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_;
+    std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+    Gnss_Synchro* gnss_synchro_;
+    int64_t fs_in_;
+    size_t item_size_;
     float threshold_;
     int doppler_max_;
+    int max_dwells_;
+    unsigned int vector_length_;
+    unsigned int channel_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
-    int max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GPS_L1_CA_PCPS_ACQUISITION_FINE_DOPPLER_H

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.cc

@@ -37,7 +37,7 @@
 #include <complex>    // for complex
 
 GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
@@ -45,22 +45,21 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
                                 out_streams_(out_streams)
 {
     pcpsconf_fpga_t acq_parameters;
-    configuration_ = configuration;
 
     DLOG(INFO) << "role " << role;
 
-    int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
-    int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
+    int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
+    int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
 
-    acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false);
+    acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false);
     DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite;
 
-    uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 4);
+    uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 4);
     acq_parameters.downsampling_factor = downsampling_factor;
     fs_in = fs_in / downsampling_factor;
 
     acq_parameters.fs_in = fs_in;
-    doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
+    doppler_max_ = configuration->property(role + ".doppler_max", 5000);
     if (FLAGS_doppler_max != 0)
         {
             doppler_max_ = FLAGS_doppler_max;
@@ -71,10 +70,10 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
     // The FPGA can only use FFT lengths that are a power of two.
     float nbits = ceilf(log2f(static_cast<float>(code_length) * 2.0));
     uint32_t nsamples_total = pow(2, nbits);
-    uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 0);
+    uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 0);
     acq_parameters.select_queue_Fpga = select_queue_Fpga;
     std::string default_device_name = "/dev/uio0";
-    std::string device_name = configuration_->property(role + ".devicename", default_device_name);
+    std::string device_name = configuration->property(role + ".devicename", default_device_name);
     acq_parameters.device_name = device_name;
     acq_parameters.samples_per_code = nsamples_total;
     acq_parameters.excludelimit = static_cast<unsigned int>(1 + ceil(GPS_L1_CA_CHIP_PERIOD_S * static_cast<float>(fs_in)));
@@ -139,12 +138,12 @@ GpsL1CaPcpsAcquisitionFpga::GpsL1CaPcpsAcquisitionFpga(
     acq_parameters.all_fft_codes = d_all_fft_codes_.data();
 
     // reference for the FPGA FFT-IFFT attenuation factor
-    acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 10);
+    acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 10);
 
-    acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4);
-    acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0);
-    acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false);
-    acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2);
+    acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4);
+    acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0);
+    acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false);
+    acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2);
     acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters);
 
     channel_ = 0;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fpga.h

@@ -45,7 +45,7 @@ public:
     /*!
      * \brief Constructor
      */
-    GpsL1CaPcpsAcquisitionFpga(ConfigurationInterface* configuration,
+    GpsL1CaPcpsAcquisitionFpga(const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -194,7 +194,6 @@ private:
     std::weak_ptr<ChannelFsm> channel_fsm_;
     std::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     std::string role_;
     int32_t doppler_center_;
     uint32_t channel_;

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc

@@ -30,7 +30,7 @@
 
 
 GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.h

@@ -38,7 +38,8 @@ class ConfigurationInterface;
 class GpsL1CaPcpsAssistedAcquisition : public AcquisitionInterface
 {
 public:
-    GpsL1CaPcpsAssistedAcquisition(ConfigurationInterface* configuration,
+    GpsL1CaPcpsAssistedAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -135,25 +136,30 @@ public:
 
 private:
     pcps_assisted_acquisition_cc_sptr acquisition_cc_;
-    size_t item_size_;
-    std::string item_type_;
-    unsigned int vector_length_;
-    unsigned int channel_;
     std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_;
+
+    std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+
+    Gnss_Synchro* gnss_synchro_;
+
+    size_t item_size_;
+    int64_t fs_in_;
+
     float threshold_;
     int doppler_max_;
-    unsigned int doppler_step_;
     int doppler_min_;
-    unsigned int sampled_ms_;
     int max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
+    unsigned int vector_length_;
+    unsigned int channel_;
+    unsigned int doppler_step_;
+    unsigned int sampled_ms_;
     unsigned int in_streams_;
     unsigned int out_streams_;
+
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GPS_L1_CA_PCPS_ASSISTED_ACQUISITION_H

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc

@@ -36,7 +36,7 @@ namespace own = gsl;
 #endif
 
 GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
@@ -49,31 +49,31 @@ GpsL1CaPcpsOpenClAcquisition::GpsL1CaPcpsOpenClAcquisition(
 
     DLOG(INFO) << "role " << role;
 
-    item_type_ = configuration_->property(role + ".item_type",
+    item_type_ = configuration->property(role + ".item_type",
         default_item_type);
 
-    int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
-    fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
-    dump_ = configuration_->property(role + ".dump", false);
+    int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
+    fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
+    dump_ = configuration->property(role + ".dump", false);
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
     if (FLAGS_doppler_max != 0)
         {
             doppler_max_ = FLAGS_doppler_max;
         }
-    sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
+    sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1);
 
-    bit_transition_flag_ = configuration_->property("Acquisition.bit_transition_flag", false);
+    bit_transition_flag_ = configuration->property("Acquisition.bit_transition_flag", false);
 
     if (!bit_transition_flag_)
         {
-            max_dwells_ = configuration_->property(role + ".max_dwells", 1);
+            max_dwells_ = configuration->property(role + ".max_dwells", 1);
         }
     else
         {
             max_dwells_ = 2;
         }
 
-    dump_filename_ = configuration_->property(role + ".dump_filename",
+    dump_filename_ = configuration->property(role + ".dump_filename",
         default_dump_filename);
 
     // -- Find number of samples per spreading code -------------------------

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h

@@ -38,7 +38,7 @@ class ConfigurationInterface;
 class GpsL1CaPcpsOpenClAcquisition : public AcquisitionInterface
 {
 public:
-    GpsL1CaPcpsOpenClAcquisition(ConfigurationInterface* configuration,
+    GpsL1CaPcpsOpenClAcquisition(const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -143,30 +143,34 @@ public:
     }
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+    const ConfigurationInterface* configuration_;
     pcps_opencl_acquisition_cc_sptr acquisition_cc_;
     gr::blocks::stream_to_vector::sptr stream_to_vector_;
-    size_t item_size_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_;
+    Gnss_Synchro* gnss_synchro_;
+
     std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+
+    int64_t fs_in_;
+    size_t item_size_;
+
+    float threshold_;
+
     unsigned int vector_length_;
     unsigned int code_length_;
-    bool bit_transition_flag_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool bit_transition_flag_;
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GPS_L1_CA_PCPS_OPENCL_ACQUISITION_H

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc

@@ -37,7 +37,7 @@ namespace own = gsl;
 #endif
 
 GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.h

@@ -40,7 +40,8 @@ class ConfigurationInterface;
 class GpsL1CaPcpsQuickSyncAcquisition : public AcquisitionInterface
 {
 public:
-    GpsL1CaPcpsQuickSyncAcquisition(ConfigurationInterface* configuration,
+    GpsL1CaPcpsQuickSyncAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -143,31 +144,35 @@ public:
     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+
+    const ConfigurationInterface* configuration_;
     pcps_quicksync_acquisition_cc_sptr acquisition_cc_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+
     gr::blocks::stream_to_vector::sptr stream_to_vector_;
-    size_t item_size_;
+    std::vector<std::complex<float>> code_;
     std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+
+    Gnss_Synchro* gnss_synchro_;
+
+    int64_t fs_in_;
+    size_t item_size_;
+    float threshold_;
     unsigned int vector_length_;
     unsigned int code_length_;
-    bool bit_transition_flag_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int max_dwells_;
     unsigned int folding_factor_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool bit_transition_flag_;
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GPS_L1_CA_PCPS_QUICKSYNC_ACQUISITION_H

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc

@@ -36,7 +36,7 @@ namespace own = gsl;
 #endif
 
 GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),

src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.h

@@ -39,7 +39,7 @@ class ConfigurationInterface;
 class GpsL1CaPcpsTongAcquisition : public AcquisitionInterface
 {
 public:
-    GpsL1CaPcpsTongAcquisition(ConfigurationInterface* configuration,
+    GpsL1CaPcpsTongAcquisition(const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -142,31 +142,32 @@ public:
     void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{};
 
 private:
-    ConfigurationInterface* configuration_;
+    float calculate_threshold(float pfa);
+
+    const ConfigurationInterface* configuration_;
     pcps_tong_acquisition_cc_sptr acquisition_cc_;
     gr::blocks::stream_to_vector::sptr stream_to_vector_;
-    size_t item_size_;
+    std::weak_ptr<ChannelFsm> channel_fsm_;
+    std::vector<std::complex<float>> code_;
+    Gnss_Synchro* gnss_synchro_;
     std::string item_type_;
+    std::string dump_filename_;
+    std::string role_;
+    int64_t fs_in_;
+    size_t item_size_;
+    float threshold_;
     unsigned int vector_length_;
     unsigned int code_length_;
     unsigned int channel_;
-    std::weak_ptr<ChannelFsm> channel_fsm_;
-    float threshold_;
     unsigned int doppler_max_;
     unsigned int doppler_step_;
     unsigned int sampled_ms_;
     unsigned int tong_init_val_;
     unsigned int tong_max_val_;
     unsigned int tong_max_dwells_;
-    int64_t fs_in_;
-    bool dump_;
-    std::string dump_filename_;
-    std::vector<std::complex<float>> code_;
-    Gnss_Synchro* gnss_synchro_;
-    std::string role_;
     unsigned int in_streams_;
     unsigned int out_streams_;
-    float calculate_threshold(float pfa);
+    bool dump_;
 };
 
 #endif  // GNSS_SDR_GPS_L1_CA_TONG_ACQUISITION_H

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc

@@ -38,16 +38,15 @@ namespace own = gsl;
 #endif
 
 GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 20;
-    acq_parameters_.SetFromConfiguration(configuration_, role, GPS_L2_M_CODE_RATE_CPS, GPS_L2C_OPT_ACQ_FS_SPS);
+    acq_parameters_.SetFromConfiguration(configuration, role, GPS_L2_M_CODE_RATE_CPS, GPS_L2C_OPT_ACQ_FS_SPS);
 
     DLOG(INFO) << "Role " << role;
 

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h

@@ -42,7 +42,8 @@ class ConfigurationInterface;
 class GpsL2MPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    GpsL2MPcpsAcquisition(ConfigurationInterface* configuration,
+    GpsL2MPcpsAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -159,7 +160,6 @@ private:
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     std::weak_ptr<ChannelFsm> channel_fsm_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.cc

@@ -37,7 +37,7 @@
 #include <complex>    // for complex
 
 GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
@@ -45,16 +45,15 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
                                 out_streams_(out_streams)
 {
     pcpsconf_fpga_t acq_parameters;
-    configuration_ = configuration;
     std::string default_dump_filename = "./acquisition.mat";
 
     LOG(INFO) << "role " << role;
 
-    int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
-    fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
+    int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
+    fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     acq_parameters.fs_in = fs_in_;
 
-    acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false);
+    acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false);
     DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite;
 
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
@@ -69,15 +68,15 @@ GpsL2MPcpsAcquisitionFpga::GpsL2MPcpsAcquisitionFpga(
     // The FPGA can only use FFT lengths that are a power of two.
     float nbits = ceilf(log2f(static_cast<float>(code_length)));
     unsigned int nsamples_total = pow(2, nbits);
-    unsigned int select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 0);
+    unsigned int select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 0);
     acq_parameters.select_queue_Fpga = select_queue_Fpga;
     std::string default_device_name = "/dev/uio0";
-    std::string device_name = configuration_->property(role + ".devicename", default_device_name);
+    std::string device_name = configuration->property(role + ".devicename", default_device_name);
     acq_parameters.device_name = device_name;
     acq_parameters.samples_per_code = nsamples_total;
 
-    acq_parameters.downsampling_factor = configuration_->property(role + ".downsampling_factor", 1.0);
-    acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 14);
+    acq_parameters.downsampling_factor = configuration->property(role + ".downsampling_factor", 1.0);
+    acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 14);
     acq_parameters.excludelimit = static_cast<uint32_t>(std::round(static_cast<double>(fs_in_) / GPS_L2_M_CODE_RATE_CPS));
 
     // compute all the GPS L2C PRN Codes (this is done only once upon the class constructor in order to avoid re-computing the PRN codes every time

src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition_fpga.h

@@ -41,7 +41,8 @@ class ConfigurationInterface;
 class GpsL2MPcpsAcquisitionFpga : public AcquisitionInterface
 {
 public:
-    GpsL2MPcpsAcquisitionFpga(ConfigurationInterface* configuration,
+    GpsL2MPcpsAcquisitionFpga(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -155,7 +156,6 @@ private:
     std::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     std::weak_ptr<ChannelFsm> channel_fsm_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     std::string item_type_;
     std::string dump_filename_;
     std::string role_;

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc

@@ -37,16 +37,15 @@ namespace own = gsl;
 #endif
 
 GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
-    configuration_ = configuration;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.SetFromConfiguration(configuration_, role, GPS_L5I_CODE_RATE_CPS, GPS_L5_OPT_ACQ_FS_SPS);
+    acq_parameters_.SetFromConfiguration(configuration, role, GPS_L5I_CODE_RATE_CPS, GPS_L5_OPT_ACQ_FS_SPS);
 
     DLOG(INFO) << "role " << role;
 

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h

@@ -42,7 +42,8 @@ class ConfigurationInterface;
 class GpsL5iPcpsAcquisition : public AcquisitionInterface
 {
 public:
-    GpsL5iPcpsAcquisition(ConfigurationInterface* configuration,
+    GpsL5iPcpsAcquisition(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -159,7 +160,6 @@ private:
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     std::weak_ptr<ChannelFsm> channel_fsm_;
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     Acq_Conf acq_parameters_;
     std::string item_type_;
     std::string dump_filename_;

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc

@@ -37,7 +37,7 @@
 #include <complex>    // for complex
 
 GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
-    ConfigurationInterface* configuration,
+    const ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
@@ -45,18 +45,17 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
                                 out_streams_(out_streams)
 {
     pcpsconf_fpga_t acq_parameters;
-    configuration_ = configuration;
     std::string default_dump_filename = "./data/acquisition.dat";
 
     LOG(INFO) << "role " << role;
 
-    int64_t fs_in_deprecated = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
-    int64_t fs_in = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
+    int64_t fs_in_deprecated = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
+    int64_t fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
 
-    acq_parameters.repeat_satellite = configuration_->property(role + ".repeat_satellite", false);
+    acq_parameters.repeat_satellite = configuration->property(role + ".repeat_satellite", false);
     DLOG(INFO) << role << " satellite repeat = " << acq_parameters.repeat_satellite;
 
-    uint32_t downsampling_factor = configuration_->property(role + ".downsampling_factor", 1);
+    uint32_t downsampling_factor = configuration->property(role + ".downsampling_factor", 1);
     acq_parameters.downsampling_factor = downsampling_factor;
 
     fs_in = fs_in / downsampling_factor;
@@ -75,10 +74,10 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
     // The FPGA can only use FFT lengths that are a power of two.
     float nbits = ceilf(log2f(static_cast<float>(code_length) * 2.0));
     uint32_t nsamples_total = pow(2, nbits);
-    uint32_t select_queue_Fpga = configuration_->property(role + ".select_queue_Fpga", 1);
+    uint32_t select_queue_Fpga = configuration->property(role + ".select_queue_Fpga", 1);
     acq_parameters.select_queue_Fpga = select_queue_Fpga;
     std::string default_device_name = "/dev/uio0";
-    std::string device_name = configuration_->property(role + ".devicename", default_device_name);
+    std::string device_name = configuration->property(role + ".devicename", default_device_name);
     acq_parameters.device_name = device_name;
     acq_parameters.samples_per_code = nsamples_total;
 
@@ -142,12 +141,12 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
     acq_parameters.all_fft_codes = d_all_fft_codes_.data();
 
     // reference for the FPGA FFT-IFFT attenuation factor
-    acq_parameters.total_block_exp = configuration_->property(role + ".total_block_exp", 13);
+    acq_parameters.total_block_exp = configuration->property(role + ".total_block_exp", 13);
 
-    acq_parameters.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4);
-    acq_parameters.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0);
-    acq_parameters.make_2_steps = configuration_->property(role + ".make_two_steps", false);
-    acq_parameters.max_num_acqs = configuration_->property(role + ".max_num_acqs", 2);
+    acq_parameters.num_doppler_bins_step2 = configuration->property(role + ".second_nbins", 4);
+    acq_parameters.doppler_step2 = configuration->property(role + ".second_doppler_step", 125.0);
+    acq_parameters.make_2_steps = configuration->property(role + ".make_two_steps", false);
+    acq_parameters.max_num_acqs = configuration->property(role + ".max_num_acqs", 2);
     acquisition_fpga_ = pcps_make_acquisition_fpga(acq_parameters);
 
     channel_ = 0;

src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.h

@@ -43,7 +43,8 @@ public:
     /*!
      * \brief Constructor
      */
-    GpsL5iPcpsAcquisitionFpga(ConfigurationInterface* configuration,
+    GpsL5iPcpsAcquisitionFpga(
+        const ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
@@ -194,7 +195,6 @@ private:
     std::weak_ptr<ChannelFsm> channel_fsm_;
     std::vector<uint32_t> d_all_fft_codes_;  // memory that contains all the code ffts
     Gnss_Synchro* gnss_synchro_;
-    ConfigurationInterface* configuration_;
     std::string item_type_;
     std::string dump_filename_;
     std::string role_;