Remove unused parameters

conf/front-end-cal.conf

@@ -182,8 +182,6 @@ Resampler.implementation=Pass_Through
 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler
 ;#item_type: Type and resolution for each of the signal samples. Use only gr_complex in this version.
 Acquisition.item_type=gr_complex
-;#if: Signal intermediate frequency in [Hz]
-Acquisition.if=0
 ;#sampled_ms: Signal block duration for the acquisition signal detection [ms]
 Acquisition.sampled_ms=1
 ;#threshold: Acquisition threshold

conf/gnss-sdr_GPS_L1_CA_ibyte.conf

@@ -52,7 +52,6 @@ Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
 Acquisition_1C.item_type=gr_complex
 Acquisition_1C.threshold=0.01
 ;Acquisition_1C.pfa=0.00001
-Acquisition_1C.if=0
 Acquisition_1C.doppler_max=10000
 Acquisition_1C.doppler_step=250
 Acquisition_1C.dump=false;
@@ -62,7 +61,6 @@ Acquisition_1C.dump_filename=/archive/gps_acquisition.dat
 ;######### TRACKING GLOBAL CONFIG ############
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 Tracking_1C.item_type=gr_complex
-Tracking_1C.if=60000
 Tracking_1C.early_late_space_chips=0.5
 Tracking_1C.pll_bw_hz=25.0;
 Tracking_1C.dll_bw_hz=3.0;

conf/gnss-sdr_GPS_L1_LimeSDR.conf

@@ -65,7 +65,6 @@ Channel.signal=1C
 ;######### ACQUISITION GLOBAL CONFIG ############
 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler
 Acquisition_1C.item_type=gr_complex
-Acquisition_1C.if=0
 Acquisition_1C.sampled_ms=1
 Acquisition_1C.threshold=0.015
 Acquisition_1C.doppler_max=10000
@@ -78,7 +77,6 @@ Acquisition_1C.dump_filename=./acq_dump.dat
 ;######### TRACKING GLOBAL CONFIG ############
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 Tracking_1C.item_type=gr_complex
-Tracking_1C.if=0
 Tracking_1C.pll_bw_hz=40.0;
 Tracking_1C.dll_bw_hz=2.0;
 Tracking_1C.order=3;

conf/gnss-sdr_GPS_L1_nsr.conf

@@ -2,7 +2,7 @@
 ; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/
 
 ; Sample configuration file for IFEN SX-NSR software receiver front-end
-; http://www.ifen.com/products/sx-scientific-gnss-solutions/nsr-software-receiver.html
+; https://www.ifen.com/products/sx3-gnss-software-receiver/
 ; This sample configuration is able to process directly .sream binary files
 ; You can define your own receiver and invoke it by doing
 ; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf

conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf

@@ -2,7 +2,7 @@
 ; The configuration API is described at https://gnss-sdr.org/docs/sp-blocks/
 
 ; Sample configuration file for IFEN SX-NSR software receiver front-end
-; http://www.ifen.com/products/sx-scientific-gnss-solutions/nsr-software-receiver.html
+; https://www.ifen.com/products/sx3-gnss-software-receiver/
 ; This sample configuration is able to process directly .sream binary files
 ; You can define your own receiver and invoke it by doing
 ; gnss-sdr --config_file=my_GNSS_SDR_configuration.conf
@@ -105,7 +105,6 @@ Channel.signal=1C
 ;######### GPS ACQUISITION CONFIG ############
 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition
 Acquisition_1C.item_type=gr_complex
-Acquisition_1C.if=0
 Acquisition_1C.sampled_ms=1
 Acquisition_1C.threshold=0.0075
 ;Acquisition_1C.pfa=0.01
@@ -118,7 +117,6 @@ Acquisition_1C.dump_filename=./acq_dump.dat
 ;######### TRACKING GPS CONFIG ############
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 Tracking_1C.item_type=gr_complex
-Tracking_1C.if=0
 Tracking_1C.pll_bw_hz=45.0;
 Tracking_1C.dll_bw_hz=2.0;
 Tracking_1C.order=3;

conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf

@@ -97,7 +97,6 @@ Tracking_1C.dump_filename=../data/epl_tracking_ch_
 ;######### TRACKING GALILEO CONFIG ############
 Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 Tracking_1B.item_type=gr_complex
-Tracking_1B.if=0
 Tracking_1B.track_pilot=true
 Tracking_1B.pll_bw_hz=4.0;
 Tracking_1B.dll_bw_hz=0.5;

conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf

@@ -188,7 +188,6 @@ Acquisition_1C.dump_filename=./acq_dump.dat
 ;######### TRACKING GLOBAL CONFIG ############
 Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 Tracking_1C.item_type=gr_complex
-Tracking_1C.if=0
 Tracking_1C.dump=false
 Tracking_1C.dump_filename=../data/epl_tracking_ch_
 Tracking_1C.pll_bw_hz=40.0;
@@ -199,7 +198,6 @@ Tracking_1C.early_late_space_chips=0.5;
 ;# GPS L2C M
 Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition
 Acquisition_2S.item_type=gr_complex
-Acquisition_2S.if=0
 Acquisition_2S.threshold=0.0005
 ;Acquisition_2S.pfa=0.001
 Acquisition_2S.doppler_max=5000
@@ -211,7 +209,6 @@ Acquisition_2S.dump_filename=./acq_dump.dat
 
 Tracking_2S.implementation=GPS_L2_M_DLL_PLL_Tracking
 Tracking_2S.item_type=gr_complex
-Tracking_2S.if=0
 Tracking_2S.pll_bw_hz=1.5;
 Tracking_2S.dll_bw_hz=0.3;
 Tracking_2S.order=3;

src/tests/system-tests/obs_gps_l1_system_test.cc

@@ -264,7 +264,6 @@ int ObsGpsL1SystemTest::configure_receiver()
     // Set Acquisition
     config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Tong_Acquisition");
     config->set_property("Acquisition_1C.item_type", "gr_complex");
-    config->set_property("Acquisition_1C.if", std::to_string(zero));
     config->set_property("Acquisition_1C.coherent_integration_time_ms", std::to_string(coherent_integration_time_ms));
     config->set_property("Acquisition_1C.threshold", std::to_string(threshold));
     config->set_property("Acquisition_1C.doppler_max", std::to_string(doppler_max));
@@ -279,7 +278,6 @@ int ObsGpsL1SystemTest::configure_receiver()
     config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
     //config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
     config->set_property("Tracking_1C.item_type", "gr_complex");
-    config->set_property("Tracking_1C.if", std::to_string(zero));
     config->set_property("Tracking_1C.dump", "false");
     config->set_property("Tracking_1C.dump_filename", "./tracking_ch_");
     config->set_property("Tracking_1C.pll_bw_hz", std::to_string(pll_bw_hz));

src/tests/system-tests/ttff.cc

@@ -188,7 +188,6 @@ void TtffTest::config_1()
     // Set Acquisition
     config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Tong_Acquisition");
     config->set_property("Acquisition_1C.item_type", "gr_complex");
-    config->set_property("Acquisition_1C.if", std::to_string(zero));
     config->set_property("Acquisition_1C.coherent_integration_time_ms", std::to_string(coherent_integration_time_ms));
     config->set_property("Acquisition_1C.threshold", std::to_string(threshold));
     config->set_property("Acquisition_1C.doppler_max", std::to_string(doppler_max));
@@ -202,7 +201,6 @@ void TtffTest::config_1()
     // Set Tracking
     config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
     config->set_property("Tracking_1C.item_type", "gr_complex");
-    config->set_property("Tracking_1C.if", std::to_string(zero));
     config->set_property("Tracking_1C.dump", "false");
     config->set_property("Tracking_1C.dump_filename", "./tracking_ch_");
     config->set_property("Tracking_1C.pll_bw_hz", std::to_string(pll_bw_hz));

src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc

@@ -137,11 +137,10 @@ void GlonassL1CaDllPllCAidTrackingTest::init()
     gnss_synchro.PRN = 11;
 
     config->set_property("GNSS-SDR.internal_fs_sps", "6625000");
+    config->set_property("Tracking_1G.implementation", "GLONASS_L1_CA_DLL_PLL_C_Aid_Tracking");
     config->set_property("Tracking_1G.item_type", "gr_complex");
     config->set_property("Tracking_1G.dump", "false");
-    config->set_property("Tracking_1G.if", "0.0");
     config->set_property("Tracking_1G.dump_filename", "./tracking_ch_");
-    config->set_property("Tracking_1G.implementation", "GLONASS_L1_CA_DLL_PLL_C_Aid_Tracking");
     config->set_property("Tracking_1G.early_late_space_chips", "0.5");
     config->set_property("Tracking_1G.order", "2");
     config->set_property("Tracking_1G.pll_bw_hz", "2");

src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc

@@ -137,11 +137,10 @@ void GlonassL1CaDllPllTrackingTest::init()
     gnss_synchro.PRN = 11;
 
     config->set_property("GNSS-SDR.internal_fs_sps", "6625000");
+    config->set_property("Tracking_1G.implementation", "GLONASS_L1_CA_DLL_PLL_Tracking");
     config->set_property("Tracking_1G.item_type", "gr_complex");
     config->set_property("Tracking_1G.dump", "false");
-    config->set_property("Tracking_1G.if", "0.0");
     config->set_property("Tracking_1G.dump_filename", "./tracking_ch_");
-    config->set_property("Tracking_1G.implementation", "GLONASS_L1_CA_DLL_PLL_Tracking");
     config->set_property("Tracking_1G.early_late_space_chips", "0.5");
     config->set_property("Tracking_1G.order", "2");
     config->set_property("Tracking_1G.pll_bw_hz", "2");

src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc

@@ -36,8 +36,8 @@
 #include <iostream>
 #include <unistd.h>
 #include <armadillo>
-#include <boost/thread.hpp>// to test the FPGA we have to create a simultaneous task to send the samples using the DMA and stop the test
+#include <boost/thread.hpp>  // to test the FPGA we have to create a simultaneous task to send the samples using the DMA and stop the test
-#include <stdio.h>// FPGA read input file
+#include <stdio.h>           // FPGA read input file
 #include <gnuradio/top_block.h>
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/analog/sig_source_waveform.h>
@@ -79,7 +79,7 @@ void send_tracking_gps_input_samples(FILE *rx_signal_file,
             exit(1);
         }
 
-    buffer_DMA = (char *) malloc(DMA_TRACK_TRANSFER_SIZE);
+    buffer_DMA = (char *)malloc(DMA_TRACK_TRANSFER_SIZE);
     if (!buffer_DMA)
         {
             fprintf(stderr, "Memory error!");
@@ -98,8 +98,7 @@ void send_tracking_gps_input_samples(FILE *rx_signal_file,
                 }
             if (num_remaining_samples > DMA_TRACK_TRANSFER_SIZE)
                 {
-
+                    fread(buffer_DMA, DMA_TRACK_TRANSFER_SIZE, 1, rx_signal_file);
-                    fread(buffer_DMA, DMA_TRACK_TRANSFER_SIZE, 1,rx_signal_file);
 
                     assert(DMA_TRACK_TRANSFER_SIZE == write(dma_descr, &buffer_DMA[0], DMA_TRACK_TRANSFER_SIZE));
                     num_remaining_samples = num_remaining_samples - DMA_TRACK_TRANSFER_SIZE;
@@ -121,7 +120,7 @@ void send_tracking_gps_input_samples(FILE *rx_signal_file,
 
 
 // thread that sends the samples to the FPGA
-void thread(gr::top_block_sptr top_block, const char * file_name)
+void thread(gr::top_block_sptr top_block, const char *file_name)
 {
     // file descriptor
     FILE *rx_signal_file;  // file descriptor
@@ -181,7 +180,7 @@ void GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events(pmt::pmt_t msg)
             long int message = pmt::to_long(msg);
             rx_message = message;
         }
-    catch (boost::bad_any_cast& e)
+    catch (boost::bad_any_cast &e)
         {
             LOG(WARNING) << "msg_handler_telemetry Bad any cast!";
             rx_message = 0;
@@ -189,8 +188,7 @@ void GpsL1CADllPllTrackingTestFpga_msg_rx::msg_handler_events(pmt::pmt_t msg)
 }
 
 
-GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() :
+GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() : gr::block("GpsL1CADllPllTrackingTestFpga_msg_rx",
-        gr::block("GpsL1CADllPllTrackingTestFpga_msg_rx",
                                                                                    gr::io_signature::make(0, 0, 0),
                                                                                    gr::io_signature::make(0, 0, 0))
 {
@@ -204,7 +202,8 @@ GpsL1CADllPllTrackingTestFpga_msg_rx::GpsL1CADllPllTrackingTestFpga_msg_rx() :
 
 
 GpsL1CADllPllTrackingTestFpga_msg_rx::~GpsL1CADllPllTrackingTestFpga_msg_rx()
-{}
+{
+}
 
 
 // ###########################################################
@@ -226,12 +225,12 @@ public:
 
     int configure_generator();
     int generate_signal();
-    void check_results_doppler(arma::vec & true_time_s, arma::vec & true_value,
+    void check_results_doppler(arma::vec &true_time_s, arma::vec &true_value,
-            arma::vec & meas_time_s, arma::vec & meas_value);
+        arma::vec &meas_time_s, arma::vec &meas_value);
-    void check_results_acc_carrier_phase(arma::vec & true_time_s,
+    void check_results_acc_carrier_phase(arma::vec &true_time_s,
-            arma::vec & true_value, arma::vec & meas_time_s, arma::vec & meas_value);
+        arma::vec &true_value, arma::vec &meas_time_s, arma::vec &meas_value);
-    void check_results_codephase(arma::vec & true_time_s, arma::vec & true_value,
+    void check_results_codephase(arma::vec &true_time_s, arma::vec &true_value,
-            arma::vec & meas_time_s, arma::vec & meas_value);
+        arma::vec &meas_time_s, arma::vec &meas_value);
 
     GpsL1CADllPllTrackingTestFpga()
     {
@@ -263,8 +262,7 @@ int GpsL1CADllPllTrackingTestFpga::configure_generator()
     p1 = std::string("-rinex_nav_file=") + FLAGS_rinex_nav_file;
     if (FLAGS_dynamic_position.empty())
         {
-            p2 = std::string("-static_position=") + FLAGS_static_position
+            p2 = std::string("-static_position=") + FLAGS_static_position + std::string(",") + std::to_string(FLAGS_duration * 10);
-                    + std::string(",") + std::to_string(FLAGS_duration * 10);
         }
     else
         {
@@ -281,8 +279,8 @@ int GpsL1CADllPllTrackingTestFpga::generate_signal()
 {
     int child_status;
 
-    char * const parmList[] = { &generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0],
+    char *const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0],
-                &p4[0], &p5[0], NULL };
+        &p4[0], &p5[0], NULL};
 
     int pid;
     if ((pid = fork()) == -1)
@@ -317,7 +315,6 @@ void GpsL1CADllPllTrackingTestFpga::configure_receiver()
     config->set_property("Tracking_1C.implementation",
         "GPS_L1_CA_DLL_PLL_Tracking_Fpga");
     config->set_property("Tracking_1C.item_type", "cshort");
-    config->set_property("Tracking_1C.if", "0");
     config->set_property("Tracking_1C.dump", "true");
     config->set_property("Tracking_1C.dump_filename", "./tracking_ch_");
     config->set_property("Tracking_1C.pll_bw_hz", "30.0");
@@ -328,8 +325,8 @@ void GpsL1CADllPllTrackingTestFpga::configure_receiver()
 }
 
 
-void GpsL1CADllPllTrackingTestFpga::check_results_doppler(arma::vec & true_time_s,
+void GpsL1CADllPllTrackingTestFpga::check_results_doppler(arma::vec &true_time_s,
-        arma::vec & true_value, arma::vec & meas_time_s, arma::vec & meas_value)
+    arma::vec &true_value, arma::vec &meas_time_s, arma::vec &meas_value)
 {
     //1. True value interpolation to match the measurement times
     arma::vec true_value_interp;
@@ -362,13 +359,13 @@ void GpsL1CADllPllTrackingTestFpga::check_results_doppler(arma::vec & true_time_
               << ", mean=" << error_mean << ", stdev=" << sqrt(error_var)
               << " (max,min)=" << max_error << "," << min_error << " [Hz]"
               << std::endl;
-    std::cout.precision (ss);
+    std::cout.precision(ss);
 }
 
 
 void GpsL1CADllPllTrackingTestFpga::check_results_acc_carrier_phase(
-        arma::vec & true_time_s, arma::vec & true_value, arma::vec & meas_time_s,
+    arma::vec &true_time_s, arma::vec &true_value, arma::vec &meas_time_s,
-        arma::vec & meas_value)
+    arma::vec &meas_value)
 {
     //1. True value interpolation to match the measurement times
     arma::vec true_value_interp;
@@ -401,13 +398,13 @@ void GpsL1CADllPllTrackingTestFpga::check_results_acc_carrier_phase(
               << ", mean=" << error_mean << ", stdev=" << sqrt(error_var)
               << " (max,min)=" << max_error << "," << min_error << " [Hz]"
               << std::endl;
-    std::cout.precision (ss);
+    std::cout.precision(ss);
 }
 
 
 void GpsL1CADllPllTrackingTestFpga::check_results_codephase(
-        arma::vec & true_time_s, arma::vec & true_value, arma::vec & meas_time_s,
+    arma::vec &true_time_s, arma::vec &true_value, arma::vec &meas_time_s,
-        arma::vec & meas_value)
+    arma::vec &meas_value)
 {
     //1. True value interpolation to match the measurement times
     arma::vec true_value_interp;
@@ -439,7 +436,7 @@ void GpsL1CADllPllTrackingTestFpga::check_results_codephase(
               << ", mean=" << error_mean << ", stdev=" << sqrt(error_var)
               << " (max,min)=" << max_error << "," << min_error << " [Chips]"
               << std::endl;
-    std::cout.precision (ss);
+    std::cout.precision(ss);
 }
 
 
@@ -468,11 +465,12 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
                 {
                     throw std::exception();
                 };
-                }) << "Failure opening true observables file";
+        })
+        << "Failure opening true observables file";
 
     top_block = gr::make_top_block("Tracking test");
     //std::shared_ptr<GpsL1CaDllPllCAidTrackingFpga> tracking = std::make_shared<GpsL1CaDllPllCAidTrackingFpga> (config.get(), "Tracking_1C", 1, 1);
-	std::shared_ptr<GpsL1CaDllPllTrackingFpga> tracking = std::make_shared<GpsL1CaDllPllTrackingFpga> (config.get(), "Tracking_1C", 1, 1);
+    std::shared_ptr<GpsL1CaDllPllTrackingFpga> tracking = std::make_shared<GpsL1CaDllPllTrackingFpga>(config.get(), "Tracking_1C", 1, 1);
 
     boost::shared_ptr<GpsL1CADllPllTrackingTestFpga_msg_rx> msg_rx = GpsL1CADllPllTrackingTestFpga_msg_rx_make();
 
@@ -483,7 +481,8 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
                 {
                     throw std::exception();
                 };
-                }) << "Failure reading true observables file";
+        })
+        << "Failure reading true observables file";
 
     //restart the epoch counter
     true_obs_data.restart();
@@ -492,43 +491,44 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
               << " Initial code delay [Chips]=" << true_obs_data.prn_delay_chips
               << std::endl;
 
-    gnss_synchro.Acq_delay_samples = (GPS_L1_CA_CODE_LENGTH_CHIPS
+    gnss_synchro.Acq_delay_samples = (GPS_L1_CA_CODE_LENGTH_CHIPS - true_obs_data.prn_delay_chips / GPS_L1_CA_CODE_LENGTH_CHIPS) * baseband_sampling_freq * GPS_L1_CA_CODE_PERIOD;
-            - true_obs_data.prn_delay_chips / GPS_L1_CA_CODE_LENGTH_CHIPS)
-            * baseband_sampling_freq * GPS_L1_CA_CODE_PERIOD;
     gnss_synchro.Acq_doppler_hz = true_obs_data.doppler_l1_hz;
     gnss_synchro.Acq_samplestamp_samples = 0;
 
     ASSERT_NO_THROW(
         {
             tracking->set_channel(gnss_synchro.Channel_ID);
-                }) << "Failure setting channel.";
+        })
+        << "Failure setting channel.";
 
     ASSERT_NO_THROW(
         {
             tracking->set_gnss_synchro(&gnss_synchro);
-                }) << "Failure setting gnss_synchro.";
+        })
+        << "Failure setting gnss_synchro.";
 
     ASSERT_NO_THROW(
         {
             tracking->connect(top_block);
-                }) << "Failure connecting tracking to the top_block.";
+        })
+        << "Failure connecting tracking to the top_block.";
 
     ASSERT_NO_THROW(
         {
             gr::blocks::null_sink::sptr sink = gr::blocks::null_sink::make(sizeof(Gnss_Synchro));
             top_block->connect(tracking->get_right_block(), 0, sink, 0);
             top_block->msg_connect(tracking->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events"));
-                }) << "Failure connecting the blocks of tracking test.";
+        })
+        << "Failure connecting the blocks of tracking test.";
 
     tracking->start_tracking();
 
     // assemble again the file name in a null terminated string (not available by default in the main program flow)
     std::string file = "./" + filename_raw_data;
-    const char * file_name = file.c_str();
+    const char *file_name = file.c_str();
 
     // start thread that sends the DMA samples to the FPGA
-    boost::thread t
+    boost::thread t{thread, top_block, file_name};
-        { thread, top_block, file_name };
 
     EXPECT_NO_THROW(
         {
@@ -537,7 +537,8 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
             //tracking->reset();// unlock the channel
             end = std::chrono::system_clock::now();
             elapsed_seconds = end - start;
-                }) << "Failure running the top_block.";
+        })
+        << "Failure running the top_block.";
 
     // wait until child thread terminates
     t.join();
@@ -572,7 +573,8 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
                 {
                     throw std::exception();
                 };
-                }) << "Failure opening tracking dump file";
+        })
+        << "Failure opening tracking dump file";
 
     nepoch = trk_dump.num_epochs();
     std::cout << "Measured observation epochs=" << nepoch << std::endl;
@@ -585,14 +587,11 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
     epoch_counter = 0;
     while (trk_dump.read_binary_obs())
         {
-            trk_timestamp_s(epoch_counter) = static_cast<double>(trk_dump.PRN_start_sample_count)
+            trk_timestamp_s(epoch_counter) = static_cast<double>(trk_dump.PRN_start_sample_count) / static_cast<double>(baseband_sampling_freq);
-                            / static_cast<double>(baseband_sampling_freq);
             trk_acc_carrier_phase_cycles(epoch_counter) = trk_dump.acc_carrier_phase_rad / GPS_TWO_PI;
             trk_Doppler_Hz(epoch_counter) = trk_dump.carrier_doppler_hz;
 
-            double delay_chips = GPS_L1_CA_CODE_LENGTH_CHIPS - GPS_L1_CA_CODE_LENGTH_CHIPS
+            double delay_chips = GPS_L1_CA_CODE_LENGTH_CHIPS - GPS_L1_CA_CODE_LENGTH_CHIPS * (fmod((static_cast<double>(trk_dump.PRN_start_sample_count) + trk_dump.aux1) / static_cast<double>(baseband_sampling_freq), 1.0e-3) / 1.0e-3);
-                                    * (fmod( (static_cast<double>(trk_dump.PRN_start_sample_count) + trk_dump.aux1)
-                                    / static_cast<double>(baseband_sampling_freq), 1.0e-3) / 1.0e-3);
 
             trk_prn_delay_chips(epoch_counter) = delay_chips;
             epoch_counter++;
@@ -600,7 +599,7 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
 
     //Align initial measurements and cut the tracking pull-in transitory
     double pull_in_offset_s = 1.0;
-    arma::uvec initial_meas_point = arma::find( trk_timestamp_s >= (true_timestamp_s(0) + pull_in_offset_s), 1, "first");
+    arma::uvec initial_meas_point = arma::find(trk_timestamp_s >= (true_timestamp_s(0) + pull_in_offset_s), 1, "first");
 
     trk_timestamp_s = trk_timestamp_s.subvec(initial_meas_point(0), trk_timestamp_s.size() - 1);
     trk_acc_carrier_phase_cycles = trk_acc_carrier_phase_cycles.subvec(initial_meas_point(0), trk_acc_carrier_phase_cycles.size() - 1);