Make save_matfile const

Some private member reordering

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc

@@ -1356,7 +1356,7 @@ void dll_pll_veml_tracking::log_data()
 }
 
 
-int32_t dll_pll_veml_tracking::save_matfile()
+int32_t dll_pll_veml_tracking::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h

@@ -86,7 +86,7 @@ private:
     void log_data();
     bool cn0_and_tracking_lock_status(double coh_integration_time_s);
     bool acquire_secondary();
-    int32_t save_matfile();
+    int32_t save_matfile() const;
 
     Cpu_Multicorrelator_Real_Codes d_multicorrelator_cpu;
     Cpu_Multicorrelator_Real_Codes d_correlator_data_cpu;  // for data channel

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc

@@ -1115,7 +1115,7 @@ void dll_pll_veml_tracking_fpga::log_data()
 }
 
 
-int32_t dll_pll_veml_tracking_fpga::save_matfile()
+int32_t dll_pll_veml_tracking_fpga::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.h

@@ -115,7 +115,7 @@ private:
     void clear_tracking_vars();
     void save_correlation_results();
     void log_data();
-    int32_t save_matfile();
+    int32_t save_matfile() const;
 
     Dll_Pll_Conf_Fpga d_trk_parameters;
 

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc

@@ -348,7 +348,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::~glonass_l1_ca_dll_pll_c_aid_tracking_c
 }
 
 
-int32_t glonass_l1_ca_dll_pll_c_aid_tracking_cc::save_matfile()
+int32_t glonass_l1_ca_dll_pll_c_aid_tracking_cc::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h

@@ -109,35 +109,48 @@ private:
         int32_t extend_correlation_ms,
         float early_late_space_chips);
 
-    // tracking configuration vars
-    uint32_t d_vector_length;
-    bool d_dump;
-
-    Gnss_Synchro* d_acquisition_gnss_synchro;
-    uint32_t d_channel;
-
-    int64_t d_fs_in;
-    double d_glonass_freq_ch;
-
-    double d_early_late_spc_chips;
-    int32_t d_n_correlator_taps;
+    void msg_handler_preamble_index(const pmt::pmt_t& msg);
+    int32_t save_matfile() const;
 
     volk_gnsssdr::vector<gr_complex> d_ca_code;
     volk_gnsssdr::vector<float> d_local_code_shift_chips;
     volk_gnsssdr::vector<gr_complex> d_correlator_outs;
+    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
+
     Cpu_Multicorrelator multicorrelator_cpu;
 
+    // PLL and DLL filter library
+    // Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_FLL_PLL_filter d_carrier_loop_filter;
+
+    // symbol history to detect bit transition
+    std::deque<gr_complex> d_E_history;
+    std::deque<gr_complex> d_P_history;
+    std::deque<gr_complex> d_L_history;
+
+    // file dump
+    std::string d_dump_filename;
+    std::ofstream d_dump_file;
+
+    std::map<std::string, std::string> systemName;
+    std::string sys;
+
+    // tracking configuration vars
+    Gnss_Synchro* d_acquisition_gnss_synchro;
+    int64_t d_fs_in;
+    double d_glonass_freq_ch;
+    double d_early_late_spc_chips;
+    uint32_t d_vector_length;
+    uint32_t d_channel;
+    int32_t d_n_correlator_taps;
+
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
     double d_rem_code_phase_chips;
     double d_rem_carrier_phase_rad;
     int32_t d_rem_code_phase_integer_samples;
 
-    // PLL and DLL filter library
-    // Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_FLL_PLL_filter d_carrier_loop_filter;
-
     // acquisition
     double d_acq_code_phase_samples;
     double d_acq_carrier_doppler_hz;
@@ -161,15 +174,8 @@ private:
     double d_code_error_filt_chips_Ti;
     double d_carr_phase_error_secs_Ti;
 
-    // symbol history to detect bit transition
-    std::deque<gr_complex> d_E_history;
-    std::deque<gr_complex> d_P_history;
-    std::deque<gr_complex> d_L_history;
     double d_preamble_timestamp_s;
     int32_t d_extend_correlation_ms;
-    bool d_enable_extended_integration;
-    bool d_preamble_synchronized;
-    void msg_handler_preamble_index(const pmt::pmt_t& msg);
 
     // Integration period in samples
     int32_t d_correlation_length_samples;
@@ -180,24 +186,19 @@ private:
 
     // CN0 estimation and lock detector
     int32_t d_cn0_estimation_counter;
-    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
     double d_carrier_lock_test;
     double d_CN0_SNV_dB_Hz;
     double d_carrier_lock_threshold;
     int32_t d_carrier_lock_fail_counter;
 
+    bool d_enable_extended_integration;
+    bool d_preamble_synchronized;
+
     // control vars
     bool d_enable_tracking;
     bool d_pull_in;
 
-    // file dump
-    std::string d_dump_filename;
-    std::ofstream d_dump_file;
-
-    std::map<std::string, std::string> systemName;
-    std::string sys;
-
-    int32_t save_matfile();
+    bool d_dump;
 };
 
 #endif  // GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc

@@ -303,7 +303,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_sc::start_tracking()
 }
 
 
-int32_t glonass_l1_ca_dll_pll_c_aid_tracking_sc::save_matfile()
+int32_t glonass_l1_ca_dll_pll_c_aid_tracking_sc::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h

@@ -108,35 +108,49 @@ private:
         int32_t extend_correlation_ms,
         float early_late_space_chips);
 
-    // tracking configuration vars
-    uint32_t d_vector_length;
-    bool d_dump;
-
-    Gnss_Synchro* d_acquisition_gnss_synchro;
-    uint32_t d_channel;
-
-    int64_t d_fs_in;
-    int64_t d_glonass_freq_ch;
-
-    double d_early_late_spc_chips;
-    int32_t d_n_correlator_taps;
+    void msg_handler_preamble_index(const pmt::pmt_t& msg);
+    int32_t save_matfile() const;
 
     volk_gnsssdr::vector<gr_complex> d_ca_code;
     volk_gnsssdr::vector<lv_16sc_t> d_ca_code_16sc;
     volk_gnsssdr::vector<float> d_local_code_shift_chips;
     volk_gnsssdr::vector<lv_16sc_t> d_correlator_outs_16sc;
+    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
+
     Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
 
+    // PLL and DLL filter library
+    Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_FLL_PLL_filter d_carrier_loop_filter;
+
+    // symbol history to detect bit transition
+    std::deque<lv_16sc_t> d_E_history;
+    std::deque<lv_16sc_t> d_P_history;
+    std::deque<lv_16sc_t> d_L_history;
+
+    Gnss_Synchro* d_acquisition_gnss_synchro;
+
+    // file dump
+    std::string d_dump_filename;
+    std::ofstream d_dump_file;
+
+    std::map<std::string, std::string> systemName;
+    std::string sys;
+
+    // tracking configuration vars
+    int64_t d_fs_in;
+    int64_t d_glonass_freq_ch;
+    double d_early_late_spc_chips;
+    uint32_t d_vector_length;
+    uint32_t d_channel;
+    int32_t d_n_correlator_taps;
+
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
     double d_rem_code_phase_chips;
     double d_rem_carrier_phase_rad;
     int32_t d_rem_code_phase_integer_samples;
 
-    // PLL and DLL filter library
-    Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_FLL_PLL_filter d_carrier_loop_filter;
-
     // acquisition
     double d_acq_code_phase_samples;
     double d_acq_carrier_doppler_hz;
@@ -159,16 +173,8 @@ private:
     double d_code_error_chips_Ti;
     double d_preamble_timestamp_s;
     int32_t d_extend_correlation_ms;
-    bool d_enable_extended_integration;
-    bool d_preamble_synchronized;
     double d_code_error_filt_chips_s;
     double d_code_error_filt_chips_Ti;
-    void msg_handler_preamble_index(const pmt::pmt_t& msg);
-
-    // symbol history to detect bit transition
-    std::deque<lv_16sc_t> d_E_history;
-    std::deque<lv_16sc_t> d_P_history;
-    std::deque<lv_16sc_t> d_L_history;
 
     // Integration period in samples
     int32_t d_correlation_length_samples;
@@ -179,24 +185,19 @@ private:
 
     // CN0 estimation and lock detector
     int32_t d_cn0_estimation_counter;
-    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
     double d_carrier_lock_test;
     double d_CN0_SNV_dB_Hz;
     double d_carrier_lock_threshold;
     int32_t d_carrier_lock_fail_counter;
 
+    bool d_enable_extended_integration;
+    bool d_preamble_synchronized;
+
     // control vars
     bool d_enable_tracking;
     bool d_pull_in;
 
-    // file dump
-    std::string d_dump_filename;
-    std::ofstream d_dump_file;
-
-    std::map<std::string, std::string> systemName;
-    std::string sys;
-
-    int32_t save_matfile();
+    bool d_dump;
 };
 
 #endif  // GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc

@@ -288,7 +288,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::~Glonass_L1_Ca_Dll_Pll_Tracking_cc()
 }
 
 
-int32_t Glonass_L1_Ca_Dll_Pll_Tracking_cc::save_matfile()
+int32_t Glonass_L1_Ca_Dll_Pll_Tracking_cc::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h

@@ -96,36 +96,43 @@ private:
         float dll_bw_hz,
         float early_late_space_chips);
 
-    // tracking configuration vars
-    uint32_t d_vector_length;
-    bool d_dump;
+    int32_t save_matfile() const;
+
+    volk_gnsssdr::vector<gr_complex> d_ca_code;
+    volk_gnsssdr::vector<float> d_local_code_shift_chips;
+    volk_gnsssdr::vector<gr_complex> d_correlator_outs;
+    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
+
+    Cpu_Multicorrelator multicorrelator_cpu;
+
+    // PLL and DLL filter library
+    Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_2nd_PLL_filter d_carrier_loop_filter;
 
     Gnss_Synchro* d_acquisition_gnss_synchro;
-    uint32_t d_channel;
 
+    // file dump
+    std::string d_dump_filename;
+    std::ofstream d_dump_file;
+
+    std::map<std::string, std::string> systemName;
+    std::string sys;
+
+    // tracking configuration vars
     int64_t d_fs_in;
     int64_t d_glonass_freq_ch;
-
     double d_early_late_spc_chips;
+    uint32_t d_vector_length;
+    uint32_t d_channel;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
     double d_rem_code_phase_chips;
     double d_rem_carr_phase_rad;
 
-    // PLL and DLL filter library
-    Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_2nd_PLL_filter d_carrier_loop_filter;
-
     // acquisition
     double d_acq_code_phase_samples;
     double d_acq_carrier_doppler_hz;
-    // correlator
-    int32_t d_n_correlator_taps;
-    volk_gnsssdr::vector<gr_complex> d_ca_code;
-    volk_gnsssdr::vector<float> d_local_code_shift_chips;
-    volk_gnsssdr::vector<gr_complex> d_correlator_outs;
-    Cpu_Multicorrelator multicorrelator_cpu;
 
     // tracking vars
     double d_code_freq_chips;
@@ -137,6 +144,9 @@ private:
     double d_acc_carrier_phase_rad;
     double d_code_phase_samples;
 
+    // correlator
+    int32_t d_n_correlator_taps;
+
     // PRN period in samples
     int32_t d_current_prn_length_samples;
 
@@ -145,25 +155,17 @@ private:
     uint64_t d_acq_sample_stamp;
 
     // CN0 estimation and lock detector
-    int32_t d_cn0_estimation_counter;
-    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
     double d_carrier_lock_test;
     double d_CN0_SNV_dB_Hz;
     double d_carrier_lock_threshold;
     int32_t d_carrier_lock_fail_counter;
+    int32_t d_cn0_estimation_counter;
 
     // control vars
     bool d_enable_tracking;
     bool d_pull_in;
 
-    // file dump
-    std::string d_dump_filename;
-    std::ofstream d_dump_file;
-
-    std::map<std::string, std::string> systemName;
-    std::string sys;
-
-    int32_t save_matfile();
+    bool d_dump;
 };
 
 #endif  // GNSS_SDR_GLONASS_L1_CA_DLL_PLL_TRACKING_CC_H

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc

@@ -345,7 +345,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::~glonass_l2_ca_dll_pll_c_aid_tracking_c
 }
 
 
-int32_t glonass_l2_ca_dll_pll_c_aid_tracking_cc::save_matfile()
+int32_t glonass_l2_ca_dll_pll_c_aid_tracking_cc::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h

@@ -105,35 +105,50 @@ private:
         int32_t extend_correlation_ms,
         float early_late_space_chips);
 
-    // tracking configuration vars
-    uint32_t d_vector_length;
-    bool d_dump;
+    void msg_handler_preamble_index(const pmt::pmt_t& msg);
 
-    Gnss_Synchro* d_acquisition_gnss_synchro;
-    uint32_t d_channel;
-
-    int64_t d_fs_in;
-    double d_glonass_freq_ch;
-
-    double d_early_late_spc_chips;
-    int32_t d_n_correlator_taps;
+    int32_t save_matfile() const;
 
     volk_gnsssdr::vector<gr_complex> d_ca_code;
     volk_gnsssdr::vector<float> d_local_code_shift_chips;
     volk_gnsssdr::vector<gr_complex> d_correlator_outs;
+    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
+
     Cpu_Multicorrelator multicorrelator_cpu;
 
+    // PLL and DLL filter library
+    // Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_FLL_PLL_filter d_carrier_loop_filter;
+
+    // symbol history to detect bit transition
+    std::deque<gr_complex> d_E_history;
+    std::deque<gr_complex> d_P_history;
+    std::deque<gr_complex> d_L_history;
+
+    // file dump
+    std::string d_dump_filename;
+    std::ofstream d_dump_file;
+
+    std::map<std::string, std::string> systemName;
+    std::string sys;
+
+    Gnss_Synchro* d_acquisition_gnss_synchro;
+
+    // tracking configuration vars
+    int64_t d_fs_in;
+    double d_glonass_freq_ch;
+    double d_early_late_spc_chips;
+    uint32_t d_vector_length;
+    uint32_t d_channel;
+    int32_t d_n_correlator_taps;
+
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
     double d_rem_code_phase_chips;
     double d_rem_carrier_phase_rad;
     int32_t d_rem_code_phase_integer_samples;
 
-    // PLL and DLL filter library
-    // Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_FLL_PLL_filter d_carrier_loop_filter;
-
     // acquisition
     double d_acq_code_phase_samples;
     double d_acq_carrier_doppler_hz;
@@ -156,16 +171,8 @@ private:
     double d_code_error_filt_chips_s;
     double d_code_error_filt_chips_Ti;
     double d_carr_phase_error_secs_Ti;
-
-    // symbol history to detect bit transition
-    std::deque<gr_complex> d_E_history;
-    std::deque<gr_complex> d_P_history;
-    std::deque<gr_complex> d_L_history;
     double d_preamble_timestamp_s;
     int32_t d_extend_correlation_ms;
-    bool d_enable_extended_integration;
-    bool d_preamble_synchronized;
-    void msg_handler_preamble_index(const pmt::pmt_t& msg);
 
     // Integration period in samples
     int32_t d_correlation_length_samples;
@@ -176,24 +183,19 @@ private:
 
     // CN0 estimation and lock detector
     int32_t d_cn0_estimation_counter;
-    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
     double d_carrier_lock_test;
     double d_CN0_SNV_dB_Hz;
     double d_carrier_lock_threshold;
     int32_t d_carrier_lock_fail_counter;
 
+    bool d_enable_extended_integration;
+    bool d_preamble_synchronized;
+
     // control vars
     bool d_enable_tracking;
     bool d_pull_in;
 
-    // file dump
-    std::string d_dump_filename;
-    std::ofstream d_dump_file;
-
-    std::map<std::string, std::string> systemName;
-    std::string sys;
-
-    int32_t save_matfile();
+    bool d_dump;
 };
 
 #endif  // GNSS_SDR_GLONASS_L1_CA_DLL_PLL_C_AID_TRACKING_CC_H

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc

@@ -301,7 +301,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_sc::start_tracking()
 }
 
 
-int32_t glonass_l2_ca_dll_pll_c_aid_tracking_sc::save_matfile()
+int32_t glonass_l2_ca_dll_pll_c_aid_tracking_sc::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h

@@ -106,35 +106,49 @@ private:
         int32_t extend_correlation_ms,
         float early_late_space_chips);
 
-    // tracking configuration vars
-    uint32_t d_vector_length;
-    bool d_dump;
+    void msg_handler_preamble_index(const pmt::pmt_t& msg);
 
-    Gnss_Synchro* d_acquisition_gnss_synchro;
-    uint32_t d_channel;
-
-    int64_t d_fs_in;
-    int64_t d_glonass_freq_ch;
-
-    double d_early_late_spc_chips;
-    int32_t d_n_correlator_taps;
+    int32_t save_matfile() const;
 
     volk_gnsssdr::vector<gr_complex> d_ca_code;
-    volk_gnsssdr::vector<lv_16sc_t> d_ca_code_16sc;
+    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
     volk_gnsssdr::vector<float> d_local_code_shift_chips;
+    volk_gnsssdr::vector<lv_16sc_t> d_ca_code_16sc;
     volk_gnsssdr::vector<lv_16sc_t> d_correlator_outs_16sc;
+
     Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
 
+    // PLL and DLL filter library
+    Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_FLL_PLL_filter d_carrier_loop_filter;
+
+    // symbol history to detect bit transition
+    std::deque<lv_16sc_t> d_E_history;
+    std::deque<lv_16sc_t> d_P_history;
+    std::deque<lv_16sc_t> d_L_history;
+
+    // file dump
+    std::string d_dump_filename;
+    std::ofstream d_dump_file;
+
+    std::map<std::string, std::string> systemName;
+    std::string sys;
+
+    // tracking configuration vars
+    Gnss_Synchro* d_acquisition_gnss_synchro;
+    int64_t d_fs_in;
+    int64_t d_glonass_freq_ch;
+    double d_early_late_spc_chips;
+    uint32_t d_vector_length;
+    uint32_t d_channel;
+    int32_t d_n_correlator_taps;
+
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
     double d_rem_code_phase_chips;
     double d_rem_carrier_phase_rad;
     int32_t d_rem_code_phase_integer_samples;
 
-    // PLL and DLL filter library
-    Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_FLL_PLL_filter d_carrier_loop_filter;
-
     // acquisition
     double d_acq_code_phase_samples;
     double d_acq_carrier_doppler_hz;
@@ -157,16 +171,8 @@ private:
     double d_code_error_chips_Ti;
     double d_preamble_timestamp_s;
     int32_t d_extend_correlation_ms;
-    bool d_enable_extended_integration;
-    bool d_preamble_synchronized;
     double d_code_error_filt_chips_s;
     double d_code_error_filt_chips_Ti;
-    void msg_handler_preamble_index(const pmt::pmt_t& msg);
-
-    // symbol history to detect bit transition
-    std::deque<lv_16sc_t> d_E_history;
-    std::deque<lv_16sc_t> d_P_history;
-    std::deque<lv_16sc_t> d_L_history;
 
     // Integration period in samples
     int32_t d_correlation_length_samples;
@@ -176,25 +182,20 @@ private:
     uint64_t d_acq_sample_stamp;
 
     // CN0 estimation and lock detector
-    int32_t d_cn0_estimation_counter;
-    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
     double d_carrier_lock_test;
     double d_CN0_SNV_dB_Hz;
     double d_carrier_lock_threshold;
     int32_t d_carrier_lock_fail_counter;
+    int32_t d_cn0_estimation_counter;
+
+    bool d_enable_extended_integration;
+    bool d_preamble_synchronized;
 
     // control vars
     bool d_enable_tracking;
     bool d_pull_in;
 
-    // file dump
-    std::string d_dump_filename;
-    std::ofstream d_dump_file;
-
-    std::map<std::string, std::string> systemName;
-    std::string sys;
-
-    int32_t save_matfile();
+    bool d_dump;
 };
 
 #endif  // GNSS_SDR_GLONASS_L2_CA_DLL_PLL_C_AID_TRACKING_SC_H

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc

@@ -289,7 +289,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::~Glonass_L2_Ca_Dll_Pll_Tracking_cc()
 }
 
 
-int32_t Glonass_L2_Ca_Dll_Pll_Tracking_cc::save_matfile()
+int32_t Glonass_L2_Ca_Dll_Pll_Tracking_cc::save_matfile() const
 {
     // READ DUMP FILE
     std::ifstream::pos_type size;

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h

@@ -94,38 +94,47 @@ private:
         float dll_bw_hz,
         float early_late_space_chips);
 
-    // tracking configuration vars
-    uint32_t d_vector_length;
-    bool d_dump;
+    int32_t save_matfile() const;
+
+    volk_gnsssdr::vector<gr_complex> d_ca_code;
+    volk_gnsssdr::vector<gr_complex> d_correlator_outs;
+    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
+    volk_gnsssdr::vector<float> d_local_code_shift_chips;
+
+    Cpu_Multicorrelator multicorrelator_cpu;
+
+    // PLL and DLL filter library
+    Tracking_2nd_DLL_filter d_code_loop_filter;
+    Tracking_2nd_PLL_filter d_carrier_loop_filter;
+
+    // file dump
+    std::string d_dump_filename;
+    std::ofstream d_dump_file;
+
+    std::map<std::string, std::string> systemName;
+    std::string sys;
 
     Gnss_Synchro* d_acquisition_gnss_synchro;
-    uint32_t d_channel;
 
+    // tracking configuration vars
     int64_t d_fs_in;
     int64_t d_glonass_freq_ch;
-
     double d_early_late_spc_chips;
+    uint32_t d_vector_length;
+    uint32_t d_channel;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
     double d_rem_code_phase_chips;
     double d_rem_carr_phase_rad;
 
-    // PLL and DLL filter library
-    Tracking_2nd_DLL_filter d_code_loop_filter;
-    Tracking_2nd_PLL_filter d_carrier_loop_filter;
-
     // acquisition
     double d_acq_code_phase_samples;
     double d_acq_carrier_doppler_hz;
+
     // correlator
     int32_t d_n_correlator_taps;
 
-    volk_gnsssdr::vector<gr_complex> d_ca_code;
-    volk_gnsssdr::vector<float> d_local_code_shift_chips;
-    volk_gnsssdr::vector<gr_complex> d_correlator_outs;
-    Cpu_Multicorrelator multicorrelator_cpu;
-
     // tracking vars
     double d_code_freq_chips;
     double d_code_phase_step_chips;
@@ -144,25 +153,17 @@ private:
     uint64_t d_acq_sample_stamp;
 
     // CN0 estimation and lock detector
-    int32_t d_cn0_estimation_counter;
-    volk_gnsssdr::vector<gr_complex> d_Prompt_buffer;
     double d_carrier_lock_test;
     double d_CN0_SNV_dB_Hz;
     double d_carrier_lock_threshold;
+    int32_t d_cn0_estimation_counter;
     int32_t d_carrier_lock_fail_counter;
 
     // control vars
     bool d_enable_tracking;
     bool d_pull_in;
 
-    // file dump
-    std::string d_dump_filename;
-    std::ofstream d_dump_file;
-
-    std::map<std::string, std::string> systemName;
-    std::string sys;
-
-    int32_t save_matfile();
+    bool d_dump;
 };
 
 #endif  // GNSS_SDR_GLONASS_L2_CA_DLL_PLL_TRACKING_CC_H