Make clang-tidy happy

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc

@@ -44,7 +44,6 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
       threshold_(0.0),
       doppler_center_(0),
       channel_(0),
-      doppler_step_(0),
       in_streams_(in_streams),
       out_streams_(out_streams),
       acquire_pilot_(configuration->property(role + ".acquire_pilot", false))
@@ -52,16 +51,15 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
     acq_parameters_.ms_per_code = 4;
     acq_parameters_.SetFromConfiguration(configuration_, role_, GALILEO_E1_CODE_CHIP_RATE_CPS, GALILEO_E1_OPT_ACQ_FS_SPS);
 
-    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    item_type_ = acq_parameters_.item_type;
-    item_size_ = acq_parameters_.it_size;
-    fs_in_ = acq_parameters_.fs_in;
-
     if (FLAGS_doppler_max != 0)
         {
             acq_parameters_.doppler_max = FLAGS_doppler_max;
         }
     doppler_max_ = acq_parameters_.doppler_max;
+    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
+    item_type_ = acq_parameters_.item_type;
+    item_size_ = acq_parameters_.it_size;
+    fs_in_ = acq_parameters_.fs_in;
 
     code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GALILEO_E1_CODE_CHIP_RATE_CPS / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
     vector_length_ = static_cast<unsigned int>(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0));

src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc

@@ -46,13 +46,13 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
 {
     acq_parameters_.SetFromConfiguration(configuration, role_, fpga_downsampling_factor, fpga_buff_num, fpga_blk_exp, GALILEO_E1_CODE_CHIP_RATE_CPS, GALILEO_E1_B_CODE_LENGTH_CHIPS);
 
-    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    fs_in_ = acq_parameters_.fs_in;
     if (FLAGS_doppler_max != 0)
         {
             acq_parameters_.doppler_max = FLAGS_doppler_max;
         }
     doppler_max_ = acq_parameters_.doppler_max;
+    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
+    fs_in_ = acq_parameters_.fs_in;
 
     uint32_t code_length = acq_parameters_.code_length;
     uint32_t nsamples_total = acq_parameters_.samples_per_code;

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc

@@ -43,7 +43,6 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(
       threshold_(0.0),
       doppler_center_(0),
       channel_(0),
-      doppler_step_(0),
       in_streams_(in_streams),
       out_streams_(out_streams),
       acq_pilot_(configuration->property(role + ".acquire_pilot", false)),
@@ -52,20 +51,15 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(
     acq_parameters_.ms_per_code = 1;
     acq_parameters_.SetFromConfiguration(configuration, role_, GALILEO_E5A_CODE_CHIP_RATE_CPS, GALILEO_E5A_OPT_ACQ_FS_SPS);
 
-    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    item_type_ = acq_parameters_.item_type;
-    item_size_ = acq_parameters_.it_size;
-    fs_in_ = acq_parameters_.fs_in;
     if (FLAGS_doppler_max != 0)
         {
             acq_parameters_.doppler_max = FLAGS_doppler_max;
         }
     doppler_max_ = acq_parameters_.doppler_max;
-
+    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    if (acq_iq_)
+    item_type_ = acq_parameters_.item_type;
-        {
+    item_size_ = acq_parameters_.it_size;
-            acq_pilot_ = false;
+    fs_in_ = acq_parameters_.fs_in;
-        }
 
     code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GALILEO_E5A_CODE_CHIP_RATE_CPS / GALILEO_E5A_CODE_LENGTH_CHIPS)));
     vector_length_ = static_cast<unsigned int>(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0 : 1.0));
@@ -77,6 +71,11 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(
     acquisition_ = pcps_make_acquisition(acq_parameters_);
     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")";
 
+    if (acq_iq_)
+        {
+            acq_pilot_ = false;
+        }
+
     if (in_streams_ > 1)
         {
             LOG(ERROR) << "This implementation only supports one input stream";

src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc

@@ -38,7 +38,6 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(
       role_(role),
       doppler_center_(0),
       channel_(0),
-      doppler_step_(0),
       in_streams_(in_streams),
       out_streams_(out_streams),
       acq_pilot_(configuration->property(role + ".acquire_pilot", false)),
@@ -46,18 +45,13 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(
 {
     acq_parameters_.SetFromConfiguration(configuration, role_, fpga_downsampling_factor, fpga_buff_num, fpga_blk_exp, GALILEO_E5A_CODE_CHIP_RATE_CPS, GALILEO_E5A_CODE_LENGTH_CHIPS);
 
-    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    fs_in_ = acq_parameters_.fs_in;
     if (FLAGS_doppler_max != 0)
         {
             acq_parameters_.doppler_max = FLAGS_doppler_max;
         }
     doppler_max_ = acq_parameters_.doppler_max;
-
+    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    if (acq_iq_)
+    fs_in_ = acq_parameters_.fs_in;
-        {
-            acq_pilot_ = false;
-        }
 
     uint32_t code_length = acq_parameters_.code_length;
     uint32_t nsamples_total = acq_parameters_.samples_per_code;
@@ -69,6 +63,11 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(
     volk_gnsssdr::vector<std::complex<float>> fft_codes_padded(nsamples_total);
     d_all_fft_codes_ = volk_gnsssdr::vector<uint32_t>(nsamples_total * GALILEO_E5A_NUMBER_OF_CODES);  // memory containing all the possible fft codes for PRN 0 to 32
 
+    if (acq_iq_)
+        {
+            acq_pilot_ = false;
+        }
+
     float max;  // temporary maxima search
     int32_t tmp;
     int32_t tmp2;

src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition.cc

@@ -43,7 +43,6 @@ GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(const ConfigurationInterfac
       threshold_(0.0),
       doppler_center_(0),
       channel_(0),
-      doppler_step_(0),
       in_streams_(in_streams),
       out_streams_(out_streams),
       acq_pilot_(configuration->property(role + ".acquire_pilot", false)),
@@ -52,20 +51,15 @@ GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(const ConfigurationInterfac
     acq_parameters_.ms_per_code = 1;
     acq_parameters_.SetFromConfiguration(configuration, role_, GALILEO_E5B_CODE_CHIP_RATE_CPS, GALILEO_E5B_OPT_ACQ_FS_SPS);
 
-    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    item_type_ = acq_parameters_.item_type;
-    item_size_ = acq_parameters_.it_size;
-    fs_in_ = acq_parameters_.fs_in;
     if (FLAGS_doppler_max != 0)
         {
             acq_parameters_.doppler_max = FLAGS_doppler_max;
         }
     doppler_max_ = acq_parameters_.doppler_max;
-
+    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    if (acq_iq_)
+    item_type_ = acq_parameters_.item_type;
-        {
+    item_size_ = acq_parameters_.it_size;
-            acq_pilot_ = false;
+    fs_in_ = acq_parameters_.fs_in;
-        }
 
     code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GALILEO_E5B_CODE_CHIP_RATE_CPS / GALILEO_E5B_CODE_LENGTH_CHIPS)));
     vector_length_ = static_cast<unsigned int>(std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2.0F : 1.0F));
@@ -77,6 +71,11 @@ GalileoE5bPcpsAcquisition::GalileoE5bPcpsAcquisition(const ConfigurationInterfac
     acquisition_ = pcps_make_acquisition(acq_parameters_);
     DLOG(INFO) << "acquisition(" << acquisition_->unique_id() << ")";
 
+    if (acq_iq_)
+        {
+            acq_pilot_ = false;
+        }
+
     if (in_streams_ > 1)
         {
             LOG(ERROR) << "This implementation only supports one input stream";

src/algorithms/acquisition/adapters/galileo_e5b_pcps_acquisition_fpga.cc

@@ -44,19 +44,13 @@ GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const Configuration
       acq_iq_(configuration->property(role + ".acquire_iq", false))
 {
     acq_parameters_.SetFromConfiguration(configuration, role_, fpga_downsampling_factor, fpga_buff_num, fpga_blk_exp, GALILEO_E5B_CODE_CHIP_RATE_CPS, GALILEO_E5B_CODE_LENGTH_CHIPS);
-
-    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    fs_in_ = acq_parameters_.fs_in;
     if (FLAGS_doppler_max != 0)
         {
             acq_parameters_.doppler_max = FLAGS_doppler_max;
         }
     doppler_max_ = acq_parameters_.doppler_max;
-
+    doppler_step_ = static_cast<unsigned int>(acq_parameters_.doppler_step);
-    if (acq_iq_)
+    fs_in_ = acq_parameters_.fs_in;
-        {
-            acq_pilot_ = false;
-        }
 
     uint32_t code_length = acq_parameters_.code_length;
     uint32_t nsamples_total = acq_parameters_.samples_per_code;
@@ -68,6 +62,11 @@ GalileoE5bPcpsAcquisitionFpga::GalileoE5bPcpsAcquisitionFpga(const Configuration
     volk_gnsssdr::vector<std::complex<float>> fft_codes_padded(nsamples_total);
     d_all_fft_codes_ = volk_gnsssdr::vector<uint32_t>(nsamples_total * GALILEO_E5B_NUMBER_OF_CODES);  // memory containing all the possible fft codes for PRN 0 to 32
 
+    if (acq_iq_)
+        {
+            acq_pilot_ = false;
+        }
+
     float max;  // temporary maxima search
     int32_t tmp;
     int32_t tmp2;