Merged master

This commit is contained in:
Anne de Jong 2020-02-21 14:42:35 +01:00
commit bb2c0df427
2 changed files with 9 additions and 3 deletions

View File

@ -5,7 +5,7 @@
// Description:
// Signal generator implementation
//////////////////////////////////////////////////////////////////////
#define TRACERPLUS (-5)
/* #define TRACERPLUS (-5) */
#include "lasp_siggen.h"
#include "lasp_alloc.h"
#include "lasp_assert.h"

View File

@ -466,8 +466,14 @@ class ThirdOctaveBankDesigner(FilterBankDesigner):
def nominal_txt(self, x):
# Put the nominal frequencies in a dictionary for easy access with
# x as the key.
index = x - self.xs[0]
return self._nominal_txt[index]
if type(x) == int:
index = x - self.xs[0]
return self._nominal_txt[index]
elif type(x) == list:
index_start = x[0] - self.xs[0]
index_stop = x[-1] - self.xs[0]
return self._nominal_txt[index_start:index_stop+1]
def band_limits(self, x, filter_class=0):
"""Returns the third octave band filter limits for filter designator x.