From 9c5825a4b17152da54db09ab2e20479bacf863e2 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Mon, 19 Oct 2015 18:22:49 -0700 Subject: [PATCH] update 9 --- lib/__init__.py | 5 +---- lib/bq.py | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/__init__.py b/lib/__init__.py index 164b3f4..114d04e 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -3,11 +3,8 @@ import numpy as np from matplotlib.pylab import show from .util import * -from .data import * -gen_filters = lambda cascade, srate: [ - s2z(*f[1], fc=f[0], srate=srate, gain=10**(f[2]/20)) for f in cascade -] from .bq import * +from .data import * from .butterworth import * from .sweeps import * from .smoothfft import * diff --git a/lib/bq.py b/lib/bq.py index fd338cd..b2610ec 100644 --- a/lib/bq.py +++ b/lib/bq.py @@ -34,3 +34,7 @@ LS2 = lambda A, Q: ((1, np.sqrt(A)/Q, A), (1, 1/np.sqrt(A)/Q, 1/A)) HS2 = lambda A, Q: ((A, np.sqrt(A)/Q, 1), (1/A, 1/np.sqrt(A)/Q, 1)) + +gen_filters = lambda cascade, srate: [ + s2z(*f[1], fc=f[0], srate=srate, gain=10**(f[2]/20)) for f in cascade +]