diff --git a/README.md b/README.md index cf70a8cb3..fe0a2270f 100644 --- a/README.md +++ b/README.md @@ -1237,8 +1237,8 @@ The user can select a given implementation for the algorithm to be used in each Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition ; Acquisition algorithm selection for this channel Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 ; Signal block duration for the acquisition signal detection [ms] -Acquisition_1C.threshold=0.005 ; Acquisition threshold -Acquisition_1C.pfa=0.0001 ; Acquisition false alarm probability. This option overrides the threshold option. +Acquisition_1C.threshold=2.5 ; Acquisition threshold +Acquisition_1C.pfa=0.01 ; Acquisition false alarm probability. This option overrides the threshold option. Acquisition_1C.doppler_max=10000 ; Maximum expected Doppler shift [Hz] Acquisition_1C.doppler_step=500 ; Doppler step in the grid search [Hz] Acquisition_1C.dump=false ; Enables internal data file logging [true] or [false] diff --git a/conf/gnss-sdr-kalman-bayes.conf b/conf/gnss-sdr-kalman-bayes.conf index 051d080de..0cdb5600f 100644 --- a/conf/gnss-sdr-kalman-bayes.conf +++ b/conf/gnss-sdr-kalman-bayes.conf @@ -31,7 +31,7 @@ Channel.signal=1C ;######### ACQUISITION GLOBAL CONFIG ############ Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex -Acquisition_1C.threshold=0.008 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.dump=false diff --git a/conf/gnss-sdr.conf b/conf/gnss-sdr.conf index 15f84fa7b..9ce7101a4 100644 --- a/conf/gnss-sdr.conf +++ b/conf/gnss-sdr.conf @@ -95,7 +95,7 @@ Channels.in_acquisition=1 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.005 +Acquisition_1C.threshold=2.5 ;Acquisition_1C.pfa=0.0001 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=500 diff --git a/conf/gnss-sdr_BDS_B1I_byte.conf b/conf/gnss-sdr_BDS_B1I_byte.conf index df8f889a3..09c360075 100644 --- a/conf/gnss-sdr_BDS_B1I_byte.conf +++ b/conf/gnss-sdr_BDS_B1I_byte.conf @@ -75,14 +75,13 @@ Channel9.satellite = 5; Acquisition_B1.implementation=BEIDOU_B1I_PCPS_Acquisition Acquisition_B1.item_type=gr_complex Acquisition_B1.coherent_integration_time_ms=1 -Acquisition_B1.threshold=0.0038 +Acquisition_B1.pfa=0.01 ;Acquisition_B1.pfa=0.0000001; Acquisition_B1.doppler_max=10000 Acquisition_B1.doppler_step=100 Acquisition_B1.dump=true Acquisition_B1.dump_filename=./bds_acq Acquisition_B1.blocking=false; -Acquisition_B1.use_CFAR_algorithm=true; Acquisition_B1.bit_transition_flag = false; diff --git a/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf b/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf index 9f9b01577..0240cdbad 100644 --- a/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf +++ b/conf/gnss-sdr_BDS_B3I_GPS_L1_CA_ibyte.conf @@ -142,7 +142,7 @@ Channel10.satellite = 30 Acquisition_B3.implementation=BEIDOU_B3I_PCPS_Acquisition Acquisition_B3.item_type=gr_complex Acquisition_B3.coherent_integration_time_ms=1 -Acquisition_B3.threshold=0.00025 +Acquisition_B3.pfa=0.01 Acquisition_B3.doppler_max=15000 Acquisition_B3.doppler_step=50 Acquisition_B3.dump=false @@ -155,7 +155,7 @@ Acquisition_B3.bit_transition_flag = false; Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=15000 Acquisition_1C.doppler_step=50 Acquisition_1C.dump=true diff --git a/conf/gnss-sdr_BDS_B3I_byte.conf b/conf/gnss-sdr_BDS_B3I_byte.conf index 47986b2da..9dfa13573 100644 --- a/conf/gnss-sdr_BDS_B3I_byte.conf +++ b/conf/gnss-sdr_BDS_B3I_byte.conf @@ -77,7 +77,7 @@ Acquisition_B3.implementation=BEIDOU_B3I_PCPS_Acquisition Acquisition_B3.item_type=gr_complex Acquisition_B3.coherent_integration_time_ms=3 Acquisition_B3.max_dwells = 2 -Acquisition_B3.threshold=0.0005 +Acquisition_B3.pfa=0.01 Acquisition_B3.doppler_max=10000 Acquisition_B3.doppler_step=100 Acquisition_B3.dump=false diff --git a/conf/gnss-sdr_BDS_B3I_ibyte.conf b/conf/gnss-sdr_BDS_B3I_ibyte.conf index fe6594f3d..78a9ac7c1 100644 --- a/conf/gnss-sdr_BDS_B3I_ibyte.conf +++ b/conf/gnss-sdr_BDS_B3I_ibyte.conf @@ -83,14 +83,13 @@ Acquisition_B3.implementation=BEIDOU_B3I_PCPS_Acquisition Acquisition_B3.item_type=gr_complex Acquisition_B3.coherent_integration_time_ms=1 Acquisition_B3.max_dwells = 1 -Acquisition_B3.threshold=0.0004 +Acquisition_B3.pfa=0.01 ;Acquisition_B3.pfa=0.0000001; Acquisition_B3.doppler_max=10000 Acquisition_B3.doppler_step=50 Acquisition_B3.dump=false Acquisition_B3.dump_filename=./bds_acq Acquisition_B3.blocking=false; -Acquisition_B3.use_CFAR_algorithm=true; Acquisition_B3.bit_transition_flag = false; diff --git a/conf/gnss-sdr_BDS_B3I_short.conf b/conf/gnss-sdr_BDS_B3I_short.conf index 72e17b5c6..e3575f5e1 100644 --- a/conf/gnss-sdr_BDS_B3I_short.conf +++ b/conf/gnss-sdr_BDS_B3I_short.conf @@ -43,14 +43,13 @@ Acquisition_B3.implementation=BEIDOU_B3I_PCPS_Acquisition Acquisition_B3.item_type=gr_complex Acquisition_B3.coherent_integration_time_ms = 1 Acquisition_B3.max_dwells = 1 -Acquisition_B3.threshold=0.0010 +Acquisition_B3.pfa=0.01 Acquisition_B3.doppler_max=10000 Acquisition_B3.doppler_step=50 Acquisition_B3.dump=true Acquisition_B3.dump_channel = 0; Acquisition_B3.dump_filename=/archive/bds_b3i_acq Acquisition_B3.blocking=false; -Acquisition_B3.use_CFAR_algorithm=true; Acquisition_B3.bit_transition_flag = false; ;######### TRACKING GLOBAL CONFIG ############ @@ -78,6 +77,3 @@ PVT.averaging_depth=100 PVT.flag_averaging=true PVT.output_rate_ms=10 PVT.display_rate_ms=500 - - - diff --git a/conf/gnss-sdr_GLONASS_L1_ibyte.conf b/conf/gnss-sdr_GLONASS_L1_ibyte.conf index 9c5183c98..6d21e7d68 100644 --- a/conf/gnss-sdr_GLONASS_L1_ibyte.conf +++ b/conf/gnss-sdr_GLONASS_L1_ibyte.conf @@ -56,7 +56,7 @@ Acquisition_1R.dump_filename=./acq_dump.dat Acquisition_1R.item_type=cshort Acquisition_1R.sampled_ms=1 Acquisition_1R.implementation=GLONASS_L1_CA_PCPS_Acquisition -Acquisition_1R.threshold=0.008 +Acquisition_1R.pfa=0.01 ;Acquisition_1C.pfa=0.000001 Acquisition_1R.doppler_max=10000 Acquisition_1R.doppler_step=250 diff --git a/conf/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf b/conf/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf index cd3345904..ce585fa18 100644 --- a/conf/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_2ch_fmcomms2_realtime.conf @@ -68,8 +68,7 @@ Channel7.signal=1C ;######### ACQUISITION GLOBAL CONFIG ############ Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex -Acquisition_1C.threshold=20 -Acquisition_1C.use_CFAR_algorithm=false +Acquisition_1C.threshold=2.5 Acquisition_1C.blocking=true Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 diff --git a/conf/gnss-sdr_GPS_L1_2ch_udp.conf b/conf/gnss-sdr_GPS_L1_2ch_udp.conf index 6dd703fa6..0418174e8 100644 --- a/conf/gnss-sdr_GPS_L1_2ch_udp.conf +++ b/conf/gnss-sdr_GPS_L1_2ch_udp.conf @@ -56,8 +56,7 @@ Channel9.RF_channel_ID=1 ;######### ACQUISITION GLOBAL CONFIG ############ Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex -Acquisition_1C.threshold=17 -Acquisition_1C.use_CFAR_algorithm=false +Acquisition_1C.threshold=2.5 Acquisition_1C.blocking=false Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 diff --git a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf index 9982a1cbd..7c3faefdd 100644 --- a/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_GN3S_realtime.conf @@ -72,7 +72,7 @@ Channel.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.008 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=500 Acquisition_1C.dump=false diff --git a/conf/gnss-sdr_GPS_L1_gr_complex.conf b/conf/gnss-sdr_GPS_L1_gr_complex.conf index 322190e7e..389cf47f8 100644 --- a/conf/gnss-sdr_GPS_L1_gr_complex.conf +++ b/conf/gnss-sdr_GPS_L1_gr_complex.conf @@ -48,7 +48,7 @@ Channel.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.008 +Acquisition_1C.pfa=0.01 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 diff --git a/conf/gnss-sdr_GPS_L1_ishort.conf b/conf/gnss-sdr_GPS_L1_ishort.conf index 11d958d7d..81a221ba9 100644 --- a/conf/gnss-sdr_GPS_L1_ishort.conf +++ b/conf/gnss-sdr_GPS_L1_ishort.conf @@ -47,7 +47,7 @@ Channel.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=cshort Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.008 +Acquisition_1C.pfa=0.01 ;Acquisition_1C.pfa=0.000001 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 diff --git a/conf/gnss-sdr_GPS_L1_nsr.conf b/conf/gnss-sdr_GPS_L1_nsr.conf index 936a916b8..9d0e2f472 100644 --- a/conf/gnss-sdr_GPS_L1_nsr.conf +++ b/conf/gnss-sdr_GPS_L1_nsr.conf @@ -92,7 +92,7 @@ Channels.in_acquisition=1 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.scoherent_integration_time_ms=1 -Acquisition_1C.threshold=0.0075 +Acquisition_1C.pfa=0.015 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=500 @@ -102,7 +102,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition Acquisition_2S.item_type=gr_complex Acquisition_2S.coherent_integration_time_ms=20 -Acquisition_2S.threshold=0.00045 +Acquisition_2S.pfa=0.01 Acquisition_2S.doppler_max=5000 Acquisition_2S.doppler_step=100 Acquisition_2S.bit_transition_flag=false diff --git a/conf/gnss-sdr_GPS_L1_nsr_kf.conf b/conf/gnss-sdr_GPS_L1_nsr_kf.conf index d2a84cd9f..161912a75 100644 --- a/conf/gnss-sdr_GPS_L1_nsr_kf.conf +++ b/conf/gnss-sdr_GPS_L1_nsr_kf.conf @@ -141,7 +141,7 @@ InputFilter.decimation_factor=8 ;#implementation: Use [Pass_Through] or [Direct_Resampler] ;#[Pass_Through] disables this block -;#[Direct_Resampler] enables a resampler that implements a nearest neigbourhood interpolation +;#[Direct_Resampler] enables a resampler that implements a nearest neighbourhood interpolation Resampler.implementation=Pass_Through ;######### CHANNELS GLOBAL CONFIG ############ @@ -152,17 +152,13 @@ Channels.in_acquisition=1 ;######### ACQUISITION GLOBAL CONFIG ############ +Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.dump=false Acquisition_1C.dump_filename=./acq_dump.dat Acquisition_1C.item_type=gr_complex Acquisition_1C.if=0 Acquisition_1C.sampled_ms=1 -Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition -;#use_CFAR_algorithm: If enabled, acquisition estimates the input signal power to implement CFAR detection algorithms -;#notice that this affects the Acquisition threshold range! -Acquisition_1C.use_CFAR_algorithm=false; -;#threshold: Acquisition threshold -Acquisition_1C.threshold=10 +Acquisition_1C.threshold=2.5 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=100 diff --git a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf index 4a60a245f..62bd6781e 100644 --- a/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf +++ b/conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf @@ -106,7 +106,7 @@ Channel.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.sampled_ms=1 -Acquisition_1C.threshold=0.0075 +Acquisition_1C.pfa=0.015 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=500 diff --git a/conf/gnss-sdr_GPS_L1_plutosdr_realtime.conf b/conf/gnss-sdr_GPS_L1_plutosdr_realtime.conf index 12123fd8e..ae97966b8 100644 --- a/conf/gnss-sdr_GPS_L1_plutosdr_realtime.conf +++ b/conf/gnss-sdr_GPS_L1_plutosdr_realtime.conf @@ -66,7 +66,7 @@ Channel.signal=1C ;######### ACQUISITION GLOBAL CONFIG ############ Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex -Acquisition_1C.threshold=0.008 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 diff --git a/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf b/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf index e48395ac3..bd4aeaa45 100644 --- a/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf +++ b/conf/gnss-sdr_GPS_L1_pulse_blanking_gr_complex.conf @@ -59,8 +59,7 @@ Channel.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.use_CFAR_algorithm=false; -Acquisition_1C.threshold=20 +Acquisition_1C.threshold=2.5 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 diff --git a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf index 1d9709626..02303e4b9 100644 --- a/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf +++ b/conf/gnss-sdr_GPS_L1_two_bits_cpx.conf @@ -88,7 +88,7 @@ Channel.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition_Fine_Doppler Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.007 +Acquisition_1C.pfa=0.01 ;Acquisition_1C.pfa=0.0001 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_min=-10000 diff --git a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf index 570e0d952..7c230d9e3 100644 --- a/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf +++ b/conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf @@ -107,7 +107,7 @@ Channel7.signal=2S ;######### ACQUISITION GLOBAL CONFIG ############ Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition Acquisition_2S.item_type=gr_complex -Acquisition_2S.threshold=0.0013 +Acquisition_2S.pfa=0.013 ;Acquisition_2S.pfa=0.001 Acquisition_2S.doppler_max=10000 Acquisition_2S.doppler_step=100 diff --git a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf index 927cb65d0..1286a24f8 100644 --- a/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf +++ b/conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf @@ -113,7 +113,7 @@ Channel7.signal=2S ;# GPS L2C M Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition Acquisition_2S.item_type=gr_complex -Acquisition_2S.threshold=0.0015 +Acquisition_2S.pfa=0.015 ;Acquisition_2S.pfa=0.001 Acquisition_2S.doppler_max=5000 Acquisition_2S.doppler_min=-5000 diff --git a/conf/gnss-sdr_Galileo_E5a.conf b/conf/gnss-sdr_Galileo_E5a.conf index f26598353..fb308cc99 100644 --- a/conf/gnss-sdr_Galileo_E5a.conf +++ b/conf/gnss-sdr_Galileo_E5a.conf @@ -66,7 +66,7 @@ Channels.in_acquisition=1 Acquisition_5X.implementation=Galileo_E5a_Noncoherent_IQ_Acquisition_CAF Acquisition_5X.item_type=gr_complex Acquisition_5X.coherent_integration_time_ms=1 -Acquisition_5X.threshold=0.001 +Acquisition_5X.pfa=0.01 Acquisition_5X.pfa=0.0003 Acquisition_5X.doppler_max=10000 Acquisition_5X.doppler_step=250 diff --git a/conf/gnss-sdr_Hybrid_byte.conf b/conf/gnss-sdr_Hybrid_byte.conf index 09a1b00d0..f35c1aa4b 100644 --- a/conf/gnss-sdr_Hybrid_byte.conf +++ b/conf/gnss-sdr_Hybrid_byte.conf @@ -83,8 +83,7 @@ Channel19.signal=1B ;######### GPS ACQUISITION CONFIG ############ Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex -Acquisition_1C.threshold=18 -Acquisition_1C.use_CFAR_algorithm=false +Acquisition_1C.threshold=3.5 Acquisition_1C.blocking=true Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 @@ -95,8 +94,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat ;######### GALILEO ACQUISITION CONFIG ############ Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition Acquisition_1B.item_type=gr_complex -Acquisition_1B.threshold=25 -Acquisition_1B.use_CFAR_algorithm=false +Acquisition_1B.threshold=2.5 Acquisition_1B.blocking=true Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=125 diff --git a/conf/gnss-sdr_Hybrid_byte_sim.conf b/conf/gnss-sdr_Hybrid_byte_sim.conf index cd5ce2f3c..28a0cda15 100644 --- a/conf/gnss-sdr_Hybrid_byte_sim.conf +++ b/conf/gnss-sdr_Hybrid_byte_sim.conf @@ -72,8 +72,7 @@ Channel15.signal=1B Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.use_CFAR_algorithm=false; -Acquisition_1C.threshold=15 +Acquisition_1C.threshold=2.5 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=6000 Acquisition_1C.doppler_step=100 diff --git a/conf/gnss-sdr_Hybrid_gr_complex.conf b/conf/gnss-sdr_Hybrid_gr_complex.conf index 11592e9d8..df0ba801f 100644 --- a/conf/gnss-sdr_Hybrid_gr_complex.conf +++ b/conf/gnss-sdr_Hybrid_gr_complex.conf @@ -53,8 +53,7 @@ Channel15.signal=1B Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.use_CFAR_algorithm=false; -Acquisition_1C.threshold=30 +Acquisition_1C.threshold=2.5 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=100 diff --git a/conf/gnss-sdr_Hybrid_ishort.conf b/conf/gnss-sdr_Hybrid_ishort.conf index 66fb7526a..0602ba72d 100644 --- a/conf/gnss-sdr_Hybrid_ishort.conf +++ b/conf/gnss-sdr_Hybrid_ishort.conf @@ -81,7 +81,7 @@ Channel7.signal=1B Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.0075 +Acquisition_1C.pfa=0.015 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=500 diff --git a/conf/gnss-sdr_Hybrid_nsr.conf b/conf/gnss-sdr_Hybrid_nsr.conf index 5778473da..5bdd70a34 100644 --- a/conf/gnss-sdr_Hybrid_nsr.conf +++ b/conf/gnss-sdr_Hybrid_nsr.conf @@ -99,8 +99,7 @@ Channel19.signal=1B ;######### GPS ACQUISITION CONFIG ############ Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex -Acquisition_1C.threshold=25 -Acquisition_1C.use_CFAR_algorithm=false +Acquisition_1C.threshold=2.5 Acquisition_1C.blocking=true Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 @@ -111,8 +110,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat ;######### GALILEO ACQUISITION CONFIG ############ Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition Acquisition_1B.item_type=gr_complex -Acquisition_1B.threshold=25 -Acquisition_1B.use_CFAR_algorithm=false +Acquisition_1B.threshold=2.5 Acquisition_1B.blocking=true Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=250 diff --git a/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf b/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf index 366299f74..bb553a980 100644 --- a/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf +++ b/conf/gnss-sdr_galileo_E1_extended_correlator_byte.conf @@ -62,8 +62,7 @@ Channel15.signal=1B Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.scoherent_integration_time_ms=1 -Acquisition_1C.use_CFAR_algorithm=false; -Acquisition_1C.threshold=18 +Acquisition_1C.threshold=2.5 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=500 Acquisition_1C.dump=false @@ -75,8 +74,7 @@ Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition Acquisition_1B.item_type=gr_complex Acquisition_1B.coherent_integration_time_ms=4 Acquisition_1B.acquire_pilot=true -Acquisition_1B.use_CFAR_algorithm=false -Acquisition_1B.threshold=21 +Acquisition_1B.threshold=2.5 Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=125 Acquisition_1B.bit_transition_flag=true diff --git a/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf b/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf index 2a63b36b6..15b8f872e 100644 --- a/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf +++ b/conf/gnss-sdr_galileo_E1_extended_correlator_labsat.conf @@ -92,8 +92,7 @@ Channel15.signal=1B Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.use_CFAR_algorithm=false; -Acquisition_1C.threshold=22 +Acquisition_1C.threshold=2.5 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 Acquisition_1C.dump=false @@ -104,8 +103,7 @@ Acquisition_1B.implementation=Galileo_E1_PCPS_Ambiguous_Acquisition Acquisition_1B.item_type=gr_complex Acquisition_1B.coherent_integration_time_ms=4 Acquisition_1B.acquire_pilot=true -Acquisition_1B.use_CFAR_algorithm=false -Acquisition_1B.threshold=22 +Acquisition_1B.threshold=2.5 Acquisition_1B.doppler_max=5000 Acquisition_1B.doppler_step=125 Acquisition_1B.bit_transition_flag=true diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf index cc23dd87b..79a4893f8 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_bin_file_III_1a.conf @@ -131,9 +131,7 @@ Channel.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.use_CFAR_algorithm=false; -Acquisition_1C.threshold=15 -;Acquisition_1C.pfa=0.0001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf index dbfb3d65c..914d4d1bb 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1a.conf @@ -139,8 +139,7 @@ Channel7.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.012 -;Acquisition_1C.pfa=0.0001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf index f35e16374..24269899e 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_III_1b.conf @@ -138,8 +138,7 @@ Channel7.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.012 -;Acquisition_1C.pfa=0.0001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf index 948028d7c..3152a74e7 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_II_3b.conf @@ -145,8 +145,7 @@ Channel7.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.012 -;Acquisition_1C.pfa=0.0001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false diff --git a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf index 5858ed9b8..7d9719c9e 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_Flexiband_realtime_I_1b.conf @@ -133,8 +133,7 @@ Channel3.signal=1C Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.011 -;Acquisition_1C.pfa=0.0001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf index ce7813575..e3d8146d3 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf @@ -227,8 +227,7 @@ Channel15.signal=2S Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.008 -;Acquisition_1C.pfa=0.0001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false @@ -251,7 +250,7 @@ Tracking_1C.dump_filename=./tracking_ch_ ;# GPS L2C M Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition Acquisition_2S.item_type=gr_complex -Acquisition_2S.threshold=0.0005 +Acquisition_2S.pfa=0.01 ;Acquisition_2S.pfa=0.001 Acquisition_2S.doppler_max=5000 Acquisition_2S.doppler_min=-5000 diff --git a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf index de5e00f1f..e473cfc85 100644 --- a/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf @@ -175,8 +175,7 @@ Channel15.RF_channel_ID=1 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.008 -;Acquisition_1C.pfa=0.0001 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false @@ -198,7 +197,7 @@ 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.threshold=0.0005 +Acquisition_2S.pfa=0.01 ;Acquisition_2S.pfa=0.001 Acquisition_2S.doppler_max=5000 Acquisition_2S.doppler_min=-5000 diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf index b407f5c79..7bf941bb7 100644 --- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf +++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b.conf @@ -227,7 +227,7 @@ Channel39.RF_channel_ID=2 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.005 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false @@ -250,7 +250,7 @@ Acquisition_1B.dump_filename=./acq_dump.dat ;# GPS L2C M Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition Acquisition_2S.item_type=gr_complex -Acquisition_2S.threshold=0.00074 +Acquisition_2S.pfa=0.01 ;Acquisition_2S.pfa=0.001 Acquisition_2S.doppler_max=5000 Acquisition_2S.doppler_min=-5000 diff --git a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf index 783d3b987..1fa76f2cd 100644 --- a/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf +++ b/conf/gnss-sdr_multichannel_GPS_L2_M_Flexiband_bin_file_III_1b_real.conf @@ -179,7 +179,7 @@ Channel19.RF_channel_ID=1 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.005 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false @@ -191,7 +191,7 @@ Acquisition_1C.dump_filename=./acq_dump.dat ;# GPS L2C M Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition Acquisition_2S.item_type=gr_complex -Acquisition_2S.threshold=0.00074 +Acquisition_2S.pfa=0.01 ;Acquisition_2S.pfa=0.001 Acquisition_2S.doppler_max=5000 Acquisition_2S.doppler_min=-5000 diff --git a/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf b/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf index 00eb0a365..c391c5d47 100644 --- a/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf +++ b/conf/gnss-sdr_multichannel_all_in_one_Flexiband_bin_file_III_1b.conf @@ -221,7 +221,7 @@ Channel42.RF_channel_ID=2 Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.005 +Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=5000 Acquisition_1C.doppler_step=250 Acquisition_1C.bit_transition_flag=false @@ -244,7 +244,7 @@ Acquisition_1B.dump_filename=./acq_dump.dat ;# GPS L2C M Acquisition_2S.implementation=GPS_L2_M_PCPS_Acquisition Acquisition_2S.item_type=gr_complex -Acquisition_2S.threshold=0.00074 +Acquisition_2S.pfa=0.01 ;Acquisition_2S.pfa=0.001 Acquisition_2S.doppler_max=5000 Acquisition_2S.doppler_min=-5000 @@ -272,7 +272,7 @@ Acquisition_5X.dump_filename=./acq_dump.dat ;# GPS L5 Acquisition_L5.implementation=GPS_L5i_PCPS_Acquisition Acquisition_L5.item_type=gr_complex -Acquisition_L5.threshold=0.00074 +Acquisition_L5.pfa=0.01 ;Acquisition_L5.pfa=0.001 Acquisition_L5.doppler_max=5000 Acquisition_L5.doppler_min=-5000 diff --git a/conf/gnss-sdr_multisource_Hybrid_ishort.conf b/conf/gnss-sdr_multisource_Hybrid_ishort.conf index 3394aff23..c579cfd2c 100644 --- a/conf/gnss-sdr_multisource_Hybrid_ishort.conf +++ b/conf/gnss-sdr_multisource_Hybrid_ishort.conf @@ -97,7 +97,7 @@ Channel.signal=1B Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.coherent_integration_time_ms=1 -Acquisition_1C.threshold=0.0075 +Acquisition_1C.pfa=0.015 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=500 diff --git a/conf/gnss-sdr_multisource_Hybrid_nsr.conf b/conf/gnss-sdr_multisource_Hybrid_nsr.conf index aecb783a6..a238adc91 100644 --- a/conf/gnss-sdr_multisource_Hybrid_nsr.conf +++ b/conf/gnss-sdr_multisource_Hybrid_nsr.conf @@ -155,7 +155,7 @@ Channel15.signal=1B Acquisition_1C.implementation=GPS_L1_CA_PCPS_Acquisition Acquisition_1C.item_type=gr_complex Acquisition_1C.scoherent_integration_time_ms=1 -Acquisition_1C.threshold=0.0075 +Acquisition_1C.pfa=0.015 ;Acquisition_1C.pfa=0.01 Acquisition_1C.doppler_max=10000 Acquisition_1C.doppler_step=500 diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc index 3cf6fc542..fca589372 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fpga.cc @@ -244,9 +244,7 @@ void pcps_acquisition_fpga::set_active(bool active) << " , doing acquisition of satellite: " << d_gnss_synchro->System << " " << d_gnss_synchro->PRN << " ,sample stamp: " << d_sample_counter << ", threshold: " << d_threshold << ", doppler_max: " << d_doppler_max - << ", doppler_step: " << d_doppler_step - // no CFAR algorithm in the FPGA - << ", use_CFAR_algorithm_flag: false"; + << ", doppler_step: " << d_doppler_step; acquisition_fpga->open_device(); acquisition_fpga->configure_acquisition(); diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc index 9ef386541..ab144bb31 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc @@ -82,7 +82,6 @@ DEFINE_int32(acq_test_doppler_max, 5000, "Maximum Doppler, in Hz"); DEFINE_int32(acq_test_doppler_step, 125, "Doppler step, in Hz."); DEFINE_int32(acq_test_coherent_time_ms, 1, "Acquisition coherent time, in ms"); DEFINE_int32(acq_test_max_dwells, 1, "Number of non-coherent integrations."); -DEFINE_bool(acq_test_use_CFAR_algorithm, true, "Use CFAR algorithm."); DEFINE_bool(acq_test_bit_transition_flag, false, "Bit transition flag."); DEFINE_bool(acq_test_make_two_steps, false, "Perform second step in a thinner grid."); DEFINE_int32(acq_test_second_nbins, 4, "If --acq_test_make_two_steps is set to true, this parameter sets the number of bins done in the acquisition refinement stage."); @@ -520,14 +519,6 @@ int AcquisitionPerformanceTest::configure_receiver(double cn0, float pfa, unsign { config->supersede_property("Acquisition.pfa", std::to_string(pfa)); } - if (FLAGS_acq_test_use_CFAR_algorithm) - { - config->set_property("Acquisition.use_CFAR_algorithm", "true"); - } - else - { - config->set_property("Acquisition.use_CFAR_algorithm", "false"); - } config->set_property("Acquisition.coherent_integration_time_ms", std::to_string(coherent_integration_time_ms)); if (FLAGS_acq_test_bit_transition_flag) diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc index b886bebee..b3e7a58d8 100644 --- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc @@ -366,7 +366,6 @@ bool HybridObservablesTest::acquire_signal() config->set_property("Acquisition.blocking", "true"); config->set_property("Acquisition.dump", "false"); config->set_property("Acquisition.dump_filename", "./data/acquisition.dat"); - config->set_property("Acquisition.use_CFAR_algorithm", "false"); std::shared_ptr acquisition; diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index 3f286acc0..9da4aa091 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -398,7 +398,6 @@ bool TrackingPullInTest::acquire_signal(int SV_ID) config->set_property("Acquisition.blocking", "true"); config->set_property("Acquisition.dump", "false"); config->set_property("Acquisition.dump_filename", "./data/acquisition.dat"); - config->set_property("Acquisition.use_CFAR_algorithm", "false"); std::shared_ptr acquisition;