mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 04:30:33 +00:00
Fix number of read samples
This commit is contained in:
parent
8d1adfbd41
commit
b922965746
@ -64,9 +64,9 @@ DEFINE_double(acq_test_cn0_init, 33.0, "Initial CN0, in dBHz.");
|
|||||||
DEFINE_double(acq_test_cn0_final, 45.0, "Final CN0, in dBHz.");
|
DEFINE_double(acq_test_cn0_final, 45.0, "Final CN0, in dBHz.");
|
||||||
DEFINE_double(acq_test_cn0_step, 3.0, "CN0 step, in dB.");
|
DEFINE_double(acq_test_cn0_step, 3.0, "CN0 step, in dB.");
|
||||||
|
|
||||||
DEFINE_double(acq_test_threshold_init, 11.0, "Initial acquisition threshold");
|
DEFINE_double(acq_test_threshold_init, 3.0, "Initial acquisition threshold");
|
||||||
DEFINE_double(acq_test_threshold_final, 16.0, "Final acquisition threshold");
|
DEFINE_double(acq_test_threshold_final, 4.0, "Final acquisition threshold");
|
||||||
DEFINE_double(acq_test_threshold_step, 1.0, "Acquisition threshold step");
|
DEFINE_double(acq_test_threshold_step, 0.5, "Acquisition threshold step");
|
||||||
|
|
||||||
DEFINE_double(acq_test_pfa_init, 1e-5, "Set initial threshold via probability of false alarm. Disable with -1.0");
|
DEFINE_double(acq_test_pfa_init, 1e-5, "Set initial threshold via probability of false alarm. Disable with -1.0");
|
||||||
|
|
||||||
@ -165,17 +165,20 @@ protected:
|
|||||||
signal_id = "1C";
|
signal_id = "1C";
|
||||||
system_id = 'G';
|
system_id = 'G';
|
||||||
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
||||||
|
min_integration_ms = 1;
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GPS_L1_CA_PCPS_Acquisition_Fine_Doppler") == 0)
|
else if (implementation.compare("GPS_L1_CA_PCPS_Acquisition_Fine_Doppler") == 0)
|
||||||
{
|
{
|
||||||
signal_id = "1C";
|
signal_id = "1C";
|
||||||
system_id = 'G';
|
system_id = 'G';
|
||||||
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
||||||
|
min_integration_ms = 1;
|
||||||
}
|
}
|
||||||
else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0)
|
else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0)
|
||||||
{
|
{
|
||||||
signal_id = "1B";
|
signal_id = "1B";
|
||||||
system_id = 'E';
|
system_id = 'E';
|
||||||
|
min_integration_ms = 4;
|
||||||
if (FLAGS_acq_test_coherent_time_ms == 1)
|
if (FLAGS_acq_test_coherent_time_ms == 1)
|
||||||
{
|
{
|
||||||
coherent_integration_time_ms = 4;
|
coherent_integration_time_ms = 4;
|
||||||
@ -190,12 +193,14 @@ protected:
|
|||||||
signal_id = "1G";
|
signal_id = "1G";
|
||||||
system_id = 'R';
|
system_id = 'R';
|
||||||
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
||||||
|
min_integration_ms = 1;
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GLONASS_L2_CA_PCPS_Acquisition") == 0)
|
else if (implementation.compare("GLONASS_L2_CA_PCPS_Acquisition") == 0)
|
||||||
{
|
{
|
||||||
signal_id = "2G";
|
signal_id = "2G";
|
||||||
system_id = 'R';
|
system_id = 'R';
|
||||||
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
||||||
|
min_integration_ms = 1;
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GPS_L2_M_PCPS_Acquisition") == 0)
|
else if (implementation.compare("GPS_L2_M_PCPS_Acquisition") == 0)
|
||||||
{
|
{
|
||||||
@ -209,12 +214,14 @@ protected:
|
|||||||
{
|
{
|
||||||
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
||||||
}
|
}
|
||||||
|
min_integration_ms = 20;
|
||||||
}
|
}
|
||||||
else if (implementation.compare("Galileo_E5a_Pcps_Acquisition") == 0)
|
else if (implementation.compare("Galileo_E5a_Pcps_Acquisition") == 0)
|
||||||
{
|
{
|
||||||
signal_id = "5X";
|
signal_id = "5X";
|
||||||
system_id = 'E';
|
system_id = 'E';
|
||||||
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
||||||
|
min_integration_ms = 1;
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GPS_L5i_PCPS_Acquisition") == 0)
|
else if (implementation.compare("GPS_L5i_PCPS_Acquisition") == 0)
|
||||||
{
|
{
|
||||||
@ -227,6 +234,7 @@ protected:
|
|||||||
signal_id = "1C";
|
signal_id = "1C";
|
||||||
system_id = 'G';
|
system_id = 'G';
|
||||||
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
|
||||||
|
min_integration_ms = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
init();
|
init();
|
||||||
@ -327,6 +335,7 @@ protected:
|
|||||||
std::string path_str = "./acq-perf-test";
|
std::string path_str = "./acq-perf-test";
|
||||||
|
|
||||||
int num_thresholds;
|
int num_thresholds;
|
||||||
|
unsigned int min_integration_ms;
|
||||||
|
|
||||||
std::vector<std::vector<float>> Pd;
|
std::vector<std::vector<float>> Pd;
|
||||||
std::vector<std::vector<float>> Pfa;
|
std::vector<std::vector<float>> Pfa;
|
||||||
@ -804,9 +813,27 @@ TEST_F(AcquisitionPerformanceTest, ROC)
|
|||||||
double coh_time_ms = config->property("Acquisition.coherent_integration_time_ms", 1);
|
double coh_time_ms = config->property("Acquisition.coherent_integration_time_ms", 1);
|
||||||
|
|
||||||
std::cout << "Num executions: " << num_executions << std::endl;
|
std::cout << "Num executions: " << num_executions << std::endl;
|
||||||
|
|
||||||
|
unsigned int fft_size = 0;
|
||||||
|
unsigned int d_consumed_samples = coh_time_ms * config->property("GNSS-SDR.internal_fs_sps", 0) * 0.001; // * (config->property("Acquisition.bit_transition_flag", false) ? 2 : 1);
|
||||||
|
if (coh_time_ms == min_integration_ms)
|
||||||
|
{
|
||||||
|
fft_size = d_consumed_samples;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fft_size = d_consumed_samples * 2;
|
||||||
|
}
|
||||||
|
|
||||||
for (int execution = 1; execution <= num_executions; execution++)
|
for (int execution = 1; execution <= num_executions; execution++)
|
||||||
{
|
{
|
||||||
acquisition_dump_reader acq_dump(basename, observed_satellite, config->property("Acquisition.doppler_max", 0), config->property("Acquisition.doppler_step", 0), config->property("GNSS-SDR.internal_fs_sps", 0) * GPS_L1_CA_CODE_PERIOD * static_cast<double>(coh_time_ms) * (config->property("Acquisition.bit_transition_flag", false) ? 2 : 1), ch, execution);
|
acquisition_dump_reader acq_dump(basename,
|
||||||
|
observed_satellite,
|
||||||
|
config->property("Acquisition.doppler_max", 0),
|
||||||
|
config->property("Acquisition.doppler_step", 0),
|
||||||
|
fft_size,
|
||||||
|
ch,
|
||||||
|
execution);
|
||||||
acq_dump.read_binary_acq();
|
acq_dump.read_binary_acq();
|
||||||
if (acq_dump.positive_acq)
|
if (acq_dump.positive_acq)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user