1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 19:50:34 +00:00

Merge branch 'mmajoral-fix_acq_perf_test' into next

This commit is contained in:
Carles Fernandez 2021-12-26 12:12:24 +01:00
commit 561c422309
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D

View File

@ -282,7 +282,16 @@ protected:
num_thresholds = pfa_vector.size(); num_thresholds = pfa_vector.size();
int aux2 = ((generated_signal_duration_s * 900 - (FLAGS_acq_test_coherent_time_ms * FLAGS_acq_test_max_dwells)) / (FLAGS_acq_test_coherent_time_ms * FLAGS_acq_test_max_dwells)); // the gnss simulator does not dump the trk observables for the last 100 ms of generated signal
int aux2;
if (FLAGS_acq_test_bit_transition_flag)
{
aux2 = floor((generated_signal_duration_s * ms_per_s - 100) / (FLAGS_acq_test_coherent_time_ms * 2.0) - 1);
}
else
{
aux2 = floor((generated_signal_duration_s * ms_per_s - 100) / (FLAGS_acq_test_coherent_time_ms * FLAGS_acq_test_max_dwells) - 1);
}
if ((FLAGS_acq_test_num_meas > 0) and (FLAGS_acq_test_num_meas < aux2)) if ((FLAGS_acq_test_num_meas > 0) and (FLAGS_acq_test_num_meas < aux2))
{ {
num_of_measurements = static_cast<unsigned int>(FLAGS_acq_test_num_meas); num_of_measurements = static_cast<unsigned int>(FLAGS_acq_test_num_meas);
@ -369,6 +378,8 @@ protected:
std::string signal_id; std::string signal_id;
private: private:
static const uint32_t ms_per_s = 1000;
std::string generator_binary; std::string generator_binary;
std::string p1; std::string p1;
std::string p2; std::string p2;
@ -991,7 +1002,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
for (int i = 0; i < num_clean_executions - 1; i++) for (int i = 0; i < num_clean_executions - 1; i++)
{ {
if (abs(clean_delay_estimation_error(i)) < 0.5 and abs(clean_doppler_estimation_error(i)) < static_cast<float>(config->property("Acquisition.doppler_step", 1)) / 2.0) if (abs(clean_delay_estimation_error(i)) < 0.5 and abs(clean_doppler_estimation_error(i)) < static_cast<float>(config->property("Acquisition.doppler_step", 1)))
{ {
correctly_detected = correctly_detected + 1.0; correctly_detected = correctly_detected + 1.0;
} }