mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-10-01 00:10:50 +00:00
Save results for all executions, not just the last one
This commit is contained in:
parent
c0337528f5
commit
47c9ad0160
@ -121,6 +121,7 @@ pcps_acquisition::pcps_acquisition(const Acq_Conf& conf_) : gr::block("pcps_acqu
|
|||||||
}
|
}
|
||||||
grid_ = arma::fmat();
|
grid_ = arma::fmat();
|
||||||
d_step_two = false;
|
d_step_two = false;
|
||||||
|
d_dump_number = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -335,17 +336,19 @@ void pcps_acquisition::send_negative_acquisition()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void pcps_acquisition::dump_results(unsigned int doppler_index, int effective_fft_size)
|
void pcps_acquisition::dump_results(int effective_fft_size)
|
||||||
{
|
{
|
||||||
memcpy(grid_.colptr(doppler_index), d_magnitude, sizeof(float) * effective_fft_size);
|
d_dump_number++;
|
||||||
if (doppler_index == (d_num_doppler_bins - 1))
|
|
||||||
{
|
|
||||||
std::string filename = acq_parameters.dump_filename;
|
std::string filename = acq_parameters.dump_filename;
|
||||||
filename.append("_");
|
filename.append("_");
|
||||||
filename.append(1, d_gnss_synchro->System);
|
filename.append(1, d_gnss_synchro->System);
|
||||||
filename.append("_");
|
filename.append("_");
|
||||||
filename.append(1, d_gnss_synchro->Signal[0]);
|
filename.append(1, d_gnss_synchro->Signal[0]);
|
||||||
filename.append(1, d_gnss_synchro->Signal[1]);
|
filename.append(1, d_gnss_synchro->Signal[1]);
|
||||||
|
filename.append("_ch_");
|
||||||
|
filename.append(std::to_string(d_channel));
|
||||||
|
filename.append("_");
|
||||||
|
filename.append(std::to_string(d_dump_number));
|
||||||
filename.append("_sat_");
|
filename.append("_sat_");
|
||||||
filename.append(std::to_string(d_gnss_synchro->PRN));
|
filename.append(std::to_string(d_gnss_synchro->PRN));
|
||||||
filename.append(".mat");
|
filename.append(".mat");
|
||||||
@ -375,7 +378,6 @@ void pcps_acquisition::dump_results(unsigned int doppler_index, int effective_ff
|
|||||||
|
|
||||||
Mat_Close(matfp);
|
Mat_Close(matfp);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -386,7 +388,7 @@ void pcps_acquisition::acquisition_core(unsigned long int samp_count)
|
|||||||
// initialize acquisition algorithm
|
// initialize acquisition algorithm
|
||||||
uint32_t indext = 0;
|
uint32_t indext = 0;
|
||||||
float magt = 0.0;
|
float magt = 0.0;
|
||||||
const gr_complex* in = d_data_buffer; //Get the input samples pointer
|
const gr_complex* in = d_data_buffer; // Get the input samples pointer
|
||||||
int effective_fft_size = (acq_parameters.bit_transition_flag ? d_fft_size / 2 : d_fft_size);
|
int effective_fft_size = (acq_parameters.bit_transition_flag ? d_fft_size / 2 : d_fft_size);
|
||||||
if (d_cshort)
|
if (d_cshort)
|
||||||
{
|
{
|
||||||
@ -479,7 +481,7 @@ void pcps_acquisition::acquisition_core(unsigned long int samp_count)
|
|||||||
// Record results to file if required
|
// Record results to file if required
|
||||||
if (acq_parameters.dump)
|
if (acq_parameters.dump)
|
||||||
{
|
{
|
||||||
pcps_acquisition::dump_results(doppler_index, effective_fft_size);
|
memcpy(grid_.colptr(doppler_index), d_magnitude, sizeof(float) * effective_fft_size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -548,10 +550,15 @@ void pcps_acquisition::acquisition_core(unsigned long int samp_count)
|
|||||||
// Record results to file if required
|
// Record results to file if required
|
||||||
if (acq_parameters.dump)
|
if (acq_parameters.dump)
|
||||||
{
|
{
|
||||||
pcps_acquisition::dump_results(doppler_index, effective_fft_size);
|
memcpy(grid_.colptr(doppler_index), d_magnitude, sizeof(float) * effective_fft_size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Record results to file if required
|
||||||
|
if (acq_parameters.dump)
|
||||||
|
{
|
||||||
|
pcps_acquisition::dump_results(effective_fft_size);
|
||||||
|
}
|
||||||
lk.lock();
|
lk.lock();
|
||||||
if (!acq_parameters.bit_transition_flag)
|
if (!acq_parameters.bit_transition_flag)
|
||||||
{
|
{
|
||||||
|
@ -93,7 +93,7 @@ private:
|
|||||||
|
|
||||||
void send_positive_acquisition();
|
void send_positive_acquisition();
|
||||||
|
|
||||||
void dump_results(unsigned int doppler_index, int effective_fft_size);
|
void dump_results(int effective_fft_size);
|
||||||
|
|
||||||
Acq_Conf acq_parameters;
|
Acq_Conf acq_parameters;
|
||||||
bool d_active;
|
bool d_active;
|
||||||
@ -123,6 +123,7 @@ private:
|
|||||||
gr::fft::fft_complex* d_ifft;
|
gr::fft::fft_complex* d_ifft;
|
||||||
Gnss_Synchro* d_gnss_synchro;
|
Gnss_Synchro* d_gnss_synchro;
|
||||||
arma::fmat grid_;
|
arma::fmat grid_;
|
||||||
|
long int d_dump_number;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
~pcps_acquisition();
|
~pcps_acquisition();
|
||||||
|
@ -73,6 +73,7 @@ bool acquisition_dump_reader::read_binary_acq()
|
|||||||
Mat_Close(matfile);
|
Mat_Close(matfile);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::vector<float> >::iterator it1;
|
std::vector<std::vector<float> >::iterator it1;
|
||||||
std::vector<float>::iterator it2;
|
std::vector<float>::iterator it2;
|
||||||
float* aux = static_cast<float*>(var_->data);
|
float* aux = static_cast<float*>(var_->data);
|
||||||
@ -93,7 +94,13 @@ bool acquisition_dump_reader::read_binary_acq()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
acquisition_dump_reader::acquisition_dump_reader(const std::string& basename, unsigned int sat, unsigned int doppler_max, unsigned int doppler_step, unsigned int samples_per_code)
|
acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
|
||||||
|
unsigned int sat,
|
||||||
|
unsigned int doppler_max,
|
||||||
|
unsigned int doppler_step,
|
||||||
|
unsigned int samples_per_code,
|
||||||
|
int channel,
|
||||||
|
int execution)
|
||||||
{
|
{
|
||||||
d_basename = basename;
|
d_basename = basename;
|
||||||
d_sat = sat;
|
d_sat = sat;
|
||||||
@ -103,7 +110,7 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename, un
|
|||||||
d_num_doppler_bins = static_cast<unsigned int>(ceil(static_cast<double>(static_cast<int>(d_doppler_max) - static_cast<int>(-d_doppler_max)) / static_cast<double>(d_doppler_step)));
|
d_num_doppler_bins = static_cast<unsigned int>(ceil(static_cast<double>(static_cast<int>(d_doppler_max) - static_cast<int>(-d_doppler_max)) / static_cast<double>(d_doppler_step)));
|
||||||
std::vector<std::vector<float> > mag_aux(d_num_doppler_bins, std::vector<float>(d_samples_per_code));
|
std::vector<std::vector<float> > mag_aux(d_num_doppler_bins, std::vector<float>(d_samples_per_code));
|
||||||
mag = mag_aux;
|
mag = mag_aux;
|
||||||
d_dump_filename = d_basename + "_sat_" + std::to_string(d_sat) + ".mat";
|
d_dump_filename = d_basename + "_ch_" + std::to_string(channel) + "_" + std::to_string(execution) + "_sat_" + std::to_string(d_sat) + ".mat";
|
||||||
for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++)
|
for (unsigned int doppler_index = 0; doppler_index < d_num_doppler_bins; doppler_index++)
|
||||||
{
|
{
|
||||||
doppler.push_back(-static_cast<int>(d_doppler_max) + d_doppler_step * doppler_index);
|
doppler.push_back(-static_cast<int>(d_doppler_max) + d_doppler_step * doppler_index);
|
||||||
|
@ -38,7 +38,13 @@
|
|||||||
class acquisition_dump_reader
|
class acquisition_dump_reader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
acquisition_dump_reader(const std::string& basename, unsigned int sat, unsigned int doppler_max, unsigned int doppler_step, unsigned int samples_per_code);
|
acquisition_dump_reader(const std::string& basename,
|
||||||
|
unsigned int sat,
|
||||||
|
unsigned int doppler_max,
|
||||||
|
unsigned int doppler_step,
|
||||||
|
unsigned int samples_per_code,
|
||||||
|
int channel = 0,
|
||||||
|
int execution = 1);
|
||||||
~acquisition_dump_reader();
|
~acquisition_dump_reader();
|
||||||
bool read_binary_acq();
|
bool read_binary_acq();
|
||||||
|
|
||||||
|
@ -33,6 +33,8 @@ file = 'acq';
|
|||||||
|
|
||||||
sat = 7;
|
sat = 7;
|
||||||
|
|
||||||
|
channel = 0;
|
||||||
|
execution = 1;
|
||||||
% Signal:
|
% Signal:
|
||||||
% 1 GPS L1
|
% 1 GPS L1
|
||||||
% 2 GPS L2M
|
% 2 GPS L2M
|
||||||
@ -77,7 +79,7 @@ switch(signal_type)
|
|||||||
system = 'R';
|
system = 'R';
|
||||||
signal = '1G';
|
signal = '1G';
|
||||||
end
|
end
|
||||||
filename = [path file '_' system '_' signal '_sat_' num2str(sat) '.mat'];
|
filename = [path file '_' system '_' signal '_ch_' num2str(channel) '_' num2str(execution) '_sat_' num2str(sat) '.mat'];
|
||||||
load(filename);
|
load(filename);
|
||||||
[n_fft n_dop_bins] = size(grid);
|
[n_fft n_dop_bins] = size(grid);
|
||||||
[d_max f_max] = find(grid == max(max(grid)));
|
[d_max f_max] = find(grid == max(max(grid)));
|
||||||
|
Loading…
Reference in New Issue
Block a user