diff --git a/src/lasp/dsp/lasp_biquadbank.cpp b/src/lasp/dsp/lasp_biquadbank.cpp index a1cb18b..6ee8060 100644 --- a/src/lasp/dsp/lasp_biquadbank.cpp +++ b/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" diff --git a/src/lasp/pybind11/lasp_dsp_pybind.cpp b/src/lasp/pybind11/lasp_dsp_pybind.cpp index 30a9a26..9cc08ae 100644 --- a/src/lasp/pybind11/lasp_dsp_pybind.cpp +++ b/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_ w(m, "Window"); py::enum_(w, "WindowType") @@ -45,38 +45,40 @@ void init_dsp(py::module &m) { w.def_static("toTxt", &Window::toText); + py::class_> filter(m, "Filter"); - /// SeriesBiquad - py::class_ sbq(m, "SeriesBiquad"); + /// SeriesBiquad + py::class_> sbq(m, "SeriesBiquad", + filter); sbq.def(py::init()); sbq.def("filter", [](SeriesBiquad &s, const vd &input) { vd res = input; s.filter(res); return res; }); - + /// BiquadBank py::class_> bqb(m, "BiquadBank"); - bqb.def(py::init()); - bqb.def("setGains",&BiquadBank::setGains); - bqb.def("filter",&BiquadBank::filter); + bqb.def(py::init()); + bqb.def("setGains", &BiquadBank::setGains); + bqb.def("filter", &BiquadBank::filter); - /// PowerSpectra + /// PowerSpectra py::class_ ps(m, "PowerSpectra"); ps.def(py::init()); ps.def("compute", &PowerSpectra::compute); - /// AvPowerSpectra + /// AvPowerSpectra py::class_ aps(m, "AvPowerSpectra"); aps.def(py::init(), - 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 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(m, "cppSLM"); diff --git a/src/lasp/pybind11/lasp_siggen.cpp b/src/lasp/pybind11/lasp_siggen.cpp index bec0689..5b1eaab 100644 --- a/src/lasp/pybind11/lasp_siggen.cpp +++ b/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(m, "Noise", siggen); noise.def(py::init<>());