diff --git a/conf/mercurio.conf b/conf/mercurio.conf index f73524665..e3e97f410 100644 --- a/conf/mercurio.conf +++ b/conf/mercurio.conf @@ -9,7 +9,8 @@ ControlThread.wait_for_flowgraph=false SignalSource.implementation=File_Signal_Source ;SignalSource.filename=/media/DATALOGGER/signals/spirent scenario 2/data/sc2_d8.dat ;SignalSource.filename=/media/My Passport/KINGSTON (G)/Project Luis/GPSL1_Fs_8MHz_ID_1_CN0_60.dat -SignalSource.filename=/media/DATALOGGER/signals/Agilent GPS Generator/cap2/agilent_cap2.dat +SignalSource.filename=/home/luis/Project/signals/cap2/agilent_cap2.dat +;SignalSource.filename=/home/luis/Project/signals/GPS_L1_8sats_4_Msps_CN0_52.dat SignalSource.item_type=gr_complex SignalSource.sampling_frequency=4000000 SignalSource.samples=0 @@ -38,7 +39,7 @@ Acquisition.sampled_ms=1 ;######### ACQUISITION 0 CONFIG ############ Acquisition0.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition0.threshold=0.055 +Acquisition0.threshold=440 Acquisition0.doppler_max=10000 Acquisition0.doppler_step=500 Acquisition0.satellite=2 @@ -46,7 +47,7 @@ Acquisition0.repeat_satellite=true ;######### ACQUISITION 1 CONFIG ############ Acquisition1.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition1.threshold=0.055 +Acquisition1.threshold=440 Acquisition1.doppler_max=10000 Acquisition1.doppler_step=500 Acquisition1.satellite=1 @@ -54,7 +55,7 @@ Acquisition1.repeat_satellite=true ;######### ACQUISITION 2 CONFIG ############ Acquisition2.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition2.threshold=0.055 +Acquisition2.threshold=440 Acquisition2.doppler_max=10000 Acquisition2.doppler_step=500 Acquisition2.satellite=11 @@ -62,7 +63,7 @@ Acquisition2.repeat_satellite=true ;######### ACQUISITION 3 CONFIG ############ Acquisition3.implementation=GPS_L1_CA_PCPS_Acquisition -Acquisition3.threshold=0.055 +Acquisition3.threshold=440 Acquisition3.doppler_max=10000 Acquisition3.doppler_step=500 Acquisition3.satellite=32 diff --git a/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc index 3fa04d36b..e2a9b43fd 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/gps_l1_ca_pcps_acquisition_cc.cc @@ -216,7 +216,7 @@ int gps_l1_ca_pcps_acquisition_cc::general_work(int noutput_items, { d_input_power += std::abs(in[i]) * std::abs(in[i]); } - //d_input_power = d_input_power / ((float)d_fft_size * (float)d_fft_size); + d_input_power = d_input_power / (float)d_fft_size; // 2º- Doppler frequency search loop @@ -255,7 +255,7 @@ int gps_l1_ca_pcps_acquisition_cc::general_work(int noutput_items, indext=i; } } - //magt = magt / (float)d_fft_size; + // Record results to files if (d_dump) { @@ -278,7 +278,7 @@ int gps_l1_ca_pcps_acquisition_cc::general_work(int noutput_items, } // 5º- Compute the test statistics and compare to the threshold - d_test_statistics = d_mag / d_input_power; + d_test_statistics = 2*d_fft_size*d_mag / d_input_power; // 6º- Declare positive or negative acquisition using a message queue if (d_test_statistics > d_threshold)