Minor changes

Changing some variable names

src/algorithms/input_filter/adapters/notch_filter.h

@@ -1,6 +1,6 @@
 /*!
  * \file notch_filter.h
- * \brief 
+ * \brief Adapter of a multistate Notch filter
  * \author Antonio Ramos, 2017. antonio.ramosdet(at)gmail.com
  *
  * Detailed description of the file here if needed.

src/algorithms/input_filter/adapters/notch_filter_lite.h

@@ -1,6 +1,6 @@
 /*!
  * \file notch_filter_lite.h
- * \brief 
+ * \brief Adapts a ligth version of a multistate notch filter
  * \author Antonio Ramos, 2017. antonio.ramosdet(at)gmail.com
  *
  * Detailed description of the file here if needed.

src/algorithms/input_filter/adapters/pulse_blanking_filter.cc

@@ -2,7 +2,7 @@
  * \file pulse_blanking_filter.cc
  * \brief Instantiates the GNSS-SDR pulse blanking filter
  * \author Javier Arribas 2017
- *
+ *         Antonio Ramos  2017
  * -------------------------------------------------------------------------
  *
  * Copyright (C) 2010-2017  (see AUTHORS file for a list of contributors)
@@ -57,7 +57,7 @@ PulseBlankingFilter::PulseBlankingFilter(ConfigurationInterface* configuration,
     int default_length_ = 32;
     int length_ = config_->property(role_ + ".length", default_length_);
     int default_n_segments_est = 12500;
-    int n_segments_est = config_->property(role_ + ".segments_estimation", default_n_segments_est);
+    int n_segments_est = config_->property(role_ + ".segments_est", default_n_segments_est);
     int default_n_segments_reset = 5000000;
     int n_segments_reset = config_->property(role_ + ".segments_reset", default_n_segments_reset);
     if (input_item_type_.compare("gr_complex") == 0)

src/algorithms/input_filter/adapters/pulse_blanking_filter.h

@@ -2,6 +2,7 @@
  * \file pulse_blanking_filter.h
  * \brief Instantiates the GNSS-SDR pulse blanking filter
  * \author Javier Arribas 2017
+ *         Antonio Ramos  2017
  *
  * -------------------------------------------------------------------------
  *

src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc

@@ -70,8 +70,10 @@ NotchLite::NotchLite(float p_c_factor, float pfa, int length_, int n_segments_es
     last_out = gr_complex(0, 0);
     boost::math::chi_squared_distribution<float> my_dist_(n_deg_fred);
     thres_ = boost::math::quantile(boost::math::complement(my_dist_, pfa));
-    c_samples = gr_complex(0, 0);
+    c_samples1 = gr_complex(0, 0);
-    angle_ = 0.0;
+    c_samples2 = gr_complex(0, 0);
+    angle1 = 0.0;
+    angle2 = 0.0;
     power_spect = static_cast<float *>(volk_malloc(length_ * sizeof(float), volk_get_alignment()));
     
 }
@@ -119,8 +121,11 @@ int NotchLite::general_work(int noutput_items __attribute__((unused)), gr_vector
                 }
                 if(n_segments_coeff == 0)
                 {
-                    volk_32fc_x2_multiply_conjugate_32fc(&c_samples, in, (in - 1), 1);
+                    volk_32fc_x2_multiply_conjugate_32fc(&c_samples1, (in + 1), in, 1);
-                    volk_32fc_s32f_atan2_32f(&angle_, &c_samples, ((float)1.0), 1);
+                    volk_32fc_s32f_atan2_32f(&angle1, &c_samples1, ((float)1.0), 1);
+                    volk_32fc_x2_multiply_conjugate_32fc(&c_samples2, (in + length_ - 1), (in + length_ - 2), 1);
+                    volk_32fc_s32f_atan2_32f(&angle2, &c_samples2, ((float)1.0), 1);
+                    float angle_ = (angle1 + angle2) / 2.0;
                     z_0 = std::exp(gr_complex(0,1) * angle_);
                 }
                 for(int aux = 0; aux < length_; aux++)

src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h

@@ -1,6 +1,6 @@
 /*!
  * \file notch_lite_cc.h
- * \brief Implements a notch filter algorithm
+ * \brief Implements a notch filter ligth algorithm
  * \author Antonio Ramos (antonio.ramosdet(at)gmail.com)
  *
  * -------------------------------------------------------------------------
@@ -41,7 +41,7 @@ typedef boost::shared_ptr<NotchLite> notch_lite_sptr;
 notch_lite_sptr make_notch_filter_lite(float p_c_factor, float pfa, int length_, int n_segments_est, int n_segments_reset, int n_segments_coeff);
 
 /*!
- * \brief This class implements a real-time software-defined single state notch filter
+ * \brief This class implements a real-time software-defined multi state notch filter ligth version
  */
 
 class NotchLite : public gr::block
@@ -62,8 +62,10 @@ private:
     gr_complex last_out;
     gr_complex z_0;
     gr_complex p_c_factor;
-    gr_complex c_samples;
+    gr_complex c_samples1;
-    float angle_;
+    gr_complex c_samples2;
+    float angle1;
+    float angle2;
     float* power_spect;
     
 public:

src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc

@@ -1,8 +1,8 @@
 /*!
  * \file pulse_blanking_cc.cc
- * \brief Implements a simple pulse blanking algorithm
+ * \brief Implements a pulse blanking algorithm
  * \author Javier Arribas (jarribas(at)cttc.es)
- *
+ *         Antonio Ramos  (antonio.ramosdet(at)gmail.com)
  * -------------------------------------------------------------------------
  *
  * Copyright (C) 2010-2017 (see AUTHORS file for a list of contributors)

src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h

@@ -1,8 +1,8 @@
 /*!
  * \file pulse_blanking_cc.h
- * \brief Implements a simple pulse blanking algorithm
+ * \brief Implements a pulse blanking algorithm
  * \author Javier Arribas (jarribas(at)cttc.es)
- *
+ *         Antonio Ramos  (antonio.ramosdet(at)gmail.com)
  * -------------------------------------------------------------------------
  *
  * Copyright (C) 2010-2017 (see AUTHORS file for a list of contributors)