From baf3f9b8c6d3e5c2a66fbd5e8d1ee6b930b76b74 Mon Sep 17 00:00:00 2001
From: Cillian O'Driscoll <cillian.odriscoll@gmail.com>
Date: Wed, 23 Dec 2015 18:51:30 +0000
Subject: [PATCH] Fixes for pcps acquisition when using double block

---
 .../adapters/galileo_e1_pcps_ambiguous_acquisition.cc        | 5 +++--
 .../acquisition/gnuradio_blocks/pcps_acquisition_cc.cc       | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index d063f35ed..aee88dbd2 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -291,10 +291,11 @@ float GalileoE1PcpsAmbiguousAcquisition::calculate_threshold(float pfa)
 
 	DLOG(INFO) <<"Channel "<<channel_<<"  Pfa = "<< pfa;
 
-    unsigned int ncells = vector_length_ * frequency_bins;
+    int effective_vector_length = ( bit_transition_flag_ ? vector_length_ / 2 : vector_length_ );
+    unsigned int ncells = effective_vector_length * frequency_bins;
 	double exponent = 1 / static_cast<double>(ncells);
 	double val = pow(1.0 - pfa,exponent);
-    double lambda = double(vector_length_);
+    double lambda = double(effective_vector_length);
 	boost::math::exponential_distribution<double> mydist (lambda);
 	float threshold = (float)quantile(mydist,val);
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
index e629ab020..85c172fb7 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
@@ -310,12 +310,12 @@ int pcps_acquisition_cc::general_work(int noutput_items,
                     d_ifft->execute();
 
                     // Search maximum
-                    size_t offset = ( d_bit_transition_flag ? effective_fft_size : 0 );
                     volk_32fc_magnitude_squared_32f(d_magnitude, d_ifft->get_outbuf() + offset, effective_fft_size);
                     volk_32f_index_max_16u(&indext, d_magnitude, effective_fft_size);
 
                     // Normalize the maximum value to correct the scale factor introduced by FFTW
-                    magt = d_magnitude[indext] / (fft_normalization_factor * fft_normalization_factor);
+                    magt = d_magnitude[indext] / (static_cast<float>( effective_fft_size ) *
+                            static_cast< float >( effective_fft_size ) * fft_normalization_factor);
 
                     // 4- record the maximum peak and the associated synchronization parameters
                     if (d_mag < magt)