mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00
Code Issues Releases Wiki Activity

Do not read use_CFAR_algorithm from configuration

Browse Source 
Now it is just an internal flag not exposed to the configuration.
Added a control to ensure pfa and pfa2 are between 0.0 and 1.0
This commit is contained in:
Carles Fernandez 2019-11-24 12:18:21 +01:00
parent f2a537e403
commit abc12aaab3
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/acquisition/libs/acq_conf.cc
View File

@ -85,7 +85,6 @@ void Acq_Conf::SetFromConfiguration(ConfigurationInterface *configuration,
doppler_max = configuration->property(role + ".doppler_max", doppler_max); doppler_max = configuration->property(role + ".doppler_max", doppler_max);
sampled_ms = configuration->property(role + ".coherent_integration_time_ms", sampled_ms); sampled_ms = configuration->property(role + ".coherent_integration_time_ms", sampled_ms);
bit_transition_flag = configuration->property(role + ".bit_transition_flag", bit_transition_flag); bit_transition_flag = configuration->property(role + ".bit_transition_flag", bit_transition_flag);
use_CFAR_algorithm_flag = configuration->property(role + ".use_CFAR_algorithm", use_CFAR_algorithm_flag); // will be false in future versions
max_dwells = configuration->property(role + ".max_dwells", max_dwells); max_dwells = configuration->property(role + ".max_dwells", max_dwells);
dump = configuration->property(role + ".dump", dump); dump = configuration->property(role + ".dump", dump);
dump_channel = configuration->property(role + ".dump_channel", dump_channel); dump_channel = configuration->property(role + ".dump_channel", dump_channel);
@ -113,8 +112,13 @@ void Acq_Conf::SetFromConfiguration(ConfigurationInterface *configuration,
doppler_step2 = configuration->property(role + ".second_doppler_step", doppler_step2); doppler_step2 = configuration->property(role + ".second_doppler_step", doppler_step2);
doppler_step = configuration->property(role + ".doppler_step", doppler_step); doppler_step = configuration->property(role + ".doppler_step", doppler_step);
pfa = configuration->property(role + ".pfa", pfa); pfa = configuration->property(role + ".pfa", pfa);
if ((pfa < 0.0) or (pfa > 1.0))
{
LOG(WARNING) << "Parameter pfa should between 0.0 and 1.0. Setting it to 0.0";
pfa = 0.0;
}
pfa2 = configuration->property(role + ".pfa_second_step", pfa2); pfa2 = configuration->property(role + ".pfa_second_step", pfa2);
if (pfa2 <= 0.0) if ((pfa2 <= 0.0) or (pfa2 > 1.0))
{ {
pfa2 = pfa; pfa2 = pfa;
} }