mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-16 20:23:02 +00:00
Code Issues Releases Wiki Activity

Notch filter solved problems

Browse Source 
Segmentation fault due to pointers in the notch filter gnu radio block solved
This commit is contained in:
Antonio Ramos 2017-07-07 11:48:54 +02:00
parent d67d9b270e
commit 119c8c1966
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/input_filter/adapters/notch_filter.cc
View File

@ -52,7 +52,7 @@ NotchFilter::NotchFilter(ConfigurationInterface* configuration, std::string role
float p_c_factor; float p_c_factor;
float default_p_c_factor = 0.9; float default_p_c_factor = 0.9;
int length_; int length_;
int default_length_ = 5; int default_length_ = 32;
std::string default_item_type = "gr_complex"; std::string default_item_type = "gr_complex";
std::string default_dump_file = "./data/input_filter.dat"; std::string default_dump_file = "./data/input_filter.dat";
item_type_ = configuration->property(role + ".item_type", default_item_type); item_type_ = configuration->property(role + ".item_type", default_item_type);

56
src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
View File

@ -32,8 +32,14 @@
#include <boost/math/distributions/chi_squared.hpp> #include <boost/math/distributions/chi_squared.hpp>
#include <cmath> #include <cmath>
#include <complex> #include <complex>
#include <cstdio>
#include <cstring>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <volk/volk.h> #include <volk/volk.h>
#include <iostream>
#include <glog/logging.h>
using google::LogMessage;
notch_sptr make_notch_filter(float pfa, float p_c_factor, notch_sptr make_notch_filter(float pfa, float p_c_factor,
int length_) int length_)
@ -50,7 +56,7 @@ Notch::Notch(float pfa, float p_c_factor, int length_) : gr::block("Notch",
set_history(2); set_history(2);
this->pfa = pfa; this->pfa = pfa;
noise_pow_est = 0.0; noise_pow_est = 0.0;
this->p_c_factor = p_c_factor; this->p_c_factor = gr_complex(p_c_factor , 0);
this->length_ = length_; //Set the number of samples per segment this->length_ = length_; //Set the number of samples per segment
set_output_multiple(length_); set_output_multiple(length_);
filter_state_ = false; //Initial state of the filter filter_state_ = false; //Initial state of the filter
@ -61,9 +67,6 @@ Notch::Notch(float pfa, float p_c_factor, int length_) : gr::block("Notch",
z_0 = gr_complex(0 , 0); z_0 = gr_complex(0 , 0);
boost::math::chi_squared_distribution<float> my_dist_(n_deg_fred); boost::math::chi_squared_distribution<float> my_dist_(n_deg_fred);
thres_ = boost::math::quantile(boost::math::complement(my_dist_, pfa)); thres_ = boost::math::quantile(boost::math::complement(my_dist_, pfa));
in = NULL;
out = NULL;
paux = NULL;
c_samples = static_cast<gr_complex *>(volk_malloc(length_ * sizeof(gr_complex), volk_get_alignment())); c_samples = static_cast<gr_complex *>(volk_malloc(length_ * sizeof(gr_complex), volk_get_alignment()));
angle_ = static_cast<float *>(volk_malloc(length_ * sizeof(float), volk_get_alignment())); angle_ = static_cast<float *>(volk_malloc(length_ * sizeof(float), volk_get_alignment()));
last_out = gr_complex(0,0); last_out = gr_complex(0,0);
@ -78,49 +81,52 @@ Notch::~Notch()
int Notch::general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)), int Notch::general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)),
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) gr_vector_const_void_star &input_items, gr_vector_void_star &output_items)
{ {
int index_in = 1; int index_in = 1;
int index_out = 0; int index_out = 0;
in = (gr_complex *) input_items[index_in];
out = (gr_complex *) output_items[index_out];
int aux = 0; int aux = 0;
gr_complex magnitude; lv_32fc_t magnitude;
float sig2 = 0.0; float sig2 = 0.0;
gr_complex* in = (gr_complex *) input_items[0];
gr_complex* out = (gr_complex *) output_items[0];
gr_complex* paux;
in++;
while(((index_out + length_) < noutput_items) && (n_segments < n_segments_est) && (filter_state_ == false)) while(((index_out + length_) < noutput_items) && (n_segments < n_segments_est) && (filter_state_ == false))
{ {
volk_32fc_x2_conjugate_dot_prod_32fc(&magnitude, in, in, length_); volk_32fc_x2_conjugate_dot_prod_32fc(&magnitude, in, in, length_);
sig2 = magnitude.real() / ((float) n_deg_fred); sig2 = lv_creal(magnitude) / ((float) n_deg_fred);
noise_pow_est = (((float) n_segments) * noise_pow_est + sig2) / ((float)(n_segments + 1)); noise_pow_est = (((float) n_segments) * noise_pow_est + sig2) / ((float)(n_segments + 1));
index_out = index_out + length_; index_out += length_;
index_in = index_in +length_; index_in += length_;
n_segments++; n_segments++;
memcpy(out, in, sizeof(gr_complex) * length_); memcpy(out, in, sizeof(gr_complex) * length_);
in = (gr_complex *) input_items[index_in]; in += length_;
out = (gr_complex *) output_items[index_out]; out += length_;
} }
while((index_out + length_) < noutput_items) while((index_out + length_) < noutput_items)
{ {
n_segments++; n_segments++;
volk_32fc_x2_conjugate_dot_prod_32fc(&magnitude, in, in, length_); volk_32fc_x2_conjugate_dot_prod_32fc(&magnitude, in, in, length_);
if( (magnitude.real() / noise_pow_est) > thres_) if( (lv_creal(magnitude) / noise_pow_est) > thres_)
{ {
if(filter_state_ == false) if(filter_state_ == false)
{ {
filter_state_ = true; filter_state_ = true;
last_out = gr_complex(0,0); last_out = gr_complex(0,0);
} }
paux = (gr_complex *) input_items[index_in-1]; paux = in - 1;
volk_32fc_x2_multiply_conjugate_32fc(c_samples, in, paux, length_); volk_32fc_x2_multiply_conjugate_32fc(c_samples, in, paux, length_);
volk_32fc_s32f_atan2_32f(angle_, c_samples, (float)1.0, length_); volk_32fc_s32f_atan2_32f(angle_, c_samples, ((float)1.0), length_);
for(aux = 0; aux < length_; aux++) for(aux = 0; aux < length_; aux++)
{ {
z_0 = std::exp(gr_complex(0,1) * angle_[aux]); z_0 = std::exp(gr_complex(0,1) * (*(angle_ + aux)));
out[index_out] = in[index_in] - z_0 * in[index_in - 1] *out = *in - z_0 * (*(in - 1))
+ gr_complex(p_c_factor,0) * z_0 * last_out; + p_c_factor * z_0 * last_out;
last_out = out[index_out]; last_out = *out;
index_out++; index_out++;
index_in++; index_in++;
in = (gr_complex *) input_items[index_in]; in ++;
out = (gr_complex *) output_items[index_out]; out ++;
} }
} }
@ -131,11 +137,11 @@ int Notch::general_work(int noutput_items __attribute__((unused)), gr_vector_int
n_segments = 0; n_segments = 0;
} }
filter_state_ = false; filter_state_ = false;
index_out = index_out + length_; index_out += length_;
index_in = index_in +length_; index_in += length_;
memcpy(out, in, sizeof(gr_complex) * length_); memcpy(out, in, sizeof(gr_complex) * length_);
in = (gr_complex *) input_items[index_in]; in += length_;
out = (gr_complex *) output_items[index_out]; out += length_;
} }
} }
consume_each(index_out); consume_each(index_out);

8
src/algorithms/input_filter/gnuradio_blocks/notch_cc.h
View File

@ -51,7 +51,7 @@ private:
float pfa; float pfa;
float noise_pow_est; float noise_pow_est;
float p_c_factor; gr_complex p_c_factor;
float thres_; float thres_;
int length_; int length_;
unsigned int n_segments; unsigned int n_segments;
@ -61,12 +61,8 @@ private:
bool filter_state_; bool filter_state_;
gr_complex last_out; gr_complex last_out;
gr_complex z_0; gr_complex z_0;
gr_complex* in;
gr_complex* out;
gr_complex* paux;
gr_complex* c_samples; gr_complex* c_samples;
float* angle_; float* angle_;
public: public: