Added setFilter possibility for Siggen, and removed one default debugtrace enabled

src/lasp/dsp/lasp_biquadbank.cpp

@@ -1,4 +1,4 @@
-#define DEBUGTRACE_ENABLED
+/* #define DEBUGTRACE_ENABLED */
 #include "lasp_biquadbank.h"
 #include "debugtrace.hpp"
 #include "lasp_thread.h"

src/lasp/pybind11/lasp_dsp_pybind.cpp

@@ -33,7 +33,7 @@ void init_dsp(py::module &m) {
   fft.def_static("load_fft_wisdom", &Fft::load_fft_wisdom);
   fft.def_static("store_fft_wisdom", &Fft::store_fft_wisdom);
 
-  /// Window 
+  /// Window
   py::class_<Window> w(m, "Window");
 
   py::enum_<Window::WindowType>(w, "WindowType")
@@ -45,38 +45,40 @@ void init_dsp(py::module &m) {
 
   w.def_static("toTxt", &Window::toText);
 
+  py::class_<Filter, std::shared_ptr<Filter>> filter(m, "Filter");
 
-  /// SeriesBiquad 
-  py::class_<SeriesBiquad> sbq(m, "SeriesBiquad");
+  /// SeriesBiquad
+  py::class_<SeriesBiquad, std::shared_ptr<SeriesBiquad>> sbq(m, "SeriesBiquad",
+                                                              filter);
   sbq.def(py::init<const vd &>());
   sbq.def("filter", [](SeriesBiquad &s, const vd &input) {
     vd res = input;
     s.filter(res);
     return res;
   });
-  
+
   /// BiquadBank
   py::class_<BiquadBank, std::shared_ptr<BiquadBank>> bqb(m, "BiquadBank");
-  bqb.def(py::init<const dmat&,const vd*>());
-  bqb.def("setGains",&BiquadBank::setGains);
-  bqb.def("filter",&BiquadBank::filter);
+  bqb.def(py::init<const dmat &, const vd *>());
+  bqb.def("setGains", &BiquadBank::setGains);
+  bqb.def("filter", &BiquadBank::filter);
 
-  /// PowerSpectra 
+  /// PowerSpectra
   py::class_<PowerSpectra> ps(m, "PowerSpectra");
   ps.def(py::init<const us, const Window::WindowType>());
   ps.def("compute", &PowerSpectra::compute);
 
-  /// AvPowerSpectra 
+  /// AvPowerSpectra
   py::class_<AvPowerSpectra> aps(m, "AvPowerSpectra");
   aps.def(py::init<const us, const Window::WindowType, const d, const int>(),
-          py::arg("nfft") = 2048, py::arg("windowType") =Window::WindowType::Hann, py::arg("overlap_percentage") = 50.0,
-          py::arg("time_constant") = -1);
+          py::arg("nfft") = 2048,
+          py::arg("windowType") = Window::WindowType::Hann,
+          py::arg("overlap_percentage") = 50.0, py::arg("time_constant") = -1);
 
   aps.def("compute", [](AvPowerSpectra &aps, const dmat &timedata) {
     std::optional<arma::cx_cube> res = aps.compute(timedata);
-      return res.value_or(arma::cx_cube(0,0,0));
-    }
-  );
+    return res.value_or(arma::cx_cube(0, 0, 0));
+  });
 
   py::class_<SLM> slm(m, "cppSLM");
 

src/lasp/pybind11/lasp_siggen.cpp

@@ -34,6 +34,7 @@ void init_siggen(py::module &m) {
   siggen.def("setLevel", &Siggen::setLevel);
   siggen.def("setLevel", &Siggen::setLevel, py::arg("newLevel"), py::arg("dB") = true);
   siggen.def("genSignal", &Siggen::genSignal);
+  siggen.def("setFilter", &Siggen::setFilter);
 
   py::class_<Noise,std::shared_ptr<Noise>> noise(m, "Noise", siggen);
   noise.def(py::init<>());