From 7e3c117ce1b54e4b2aca0abb96dfad6c06567ece Mon Sep 17 00:00:00 2001 From: "J.A. de Jong - Redu-Sone B.V., ASCEE V.O.F" Date: Sun, 18 Oct 2020 14:09:51 +0200 Subject: [PATCH 1/2] Set default FFT lib to FFTW --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 664e68b..02aa527 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,8 @@ add_definitions(-DLASP_MAX_NFFT=33554432) # 2**25 add_definitions(-D_REENTRANT) # ############### Choose an fft backend here -set(LASP_FFT_BACKEND fftpack) -#set(LASP_FFT_BACKEND "fftw") +# set(LASP_FFT_BACKEND fftpack) +set(LASP_FFT_BACKEND "fftw") if(LASP_FFT_BACKEND STREQUAL "fftw") find_library(FFTW_LIBRARY NAMES fftw3 fftw) From 013bc479c711307d3bdc6af335362d264ae39464 Mon Sep 17 00:00:00 2001 From: "J.A. de Jong - Redu-Sone B.V., ASCEE V.O.F" Date: Mon, 19 Oct 2020 16:58:09 +0200 Subject: [PATCH 2/2] Small bugfix in SLM --- lasp/lasp_slm.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lasp/lasp_slm.py b/lasp/lasp_slm.py index 5c9a944..4c3f853 100644 --- a/lasp/lasp_slm.py +++ b/lasp/lasp_slm.py @@ -113,9 +113,8 @@ class SLM: # No filterbank, means we do only compute the overall values. This # means that in case of include_overall, it creates two overall # channels. That would be confusing, so we do not allow it. - if include_overall: - sos = sos_overall[np.newaxis,:] - self.nom_txt.append('overall') + sos = sos_overall[np.newaxis,:] + self.nom_txt.append('overall') self.slm = pyxSlm(prefilter, sos, fs, tw[0], level_ref_value)