From c21bab35d9e337135a3c2e5b9a6181fb2d633b91 Mon Sep 17 00:00:00 2001 From: bma Date: Tue, 6 Feb 2018 20:43:14 +0100 Subject: [PATCH] replace 4 spaces by tabs --- dat_ident.py | 16 ++++++++-------- first_order_ident.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dat_ident.py b/dat_ident.py index 1eef513..2ca477a 100644 --- a/dat_ident.py +++ b/dat_ident.py @@ -12,11 +12,11 @@ tic = time.time() os.chdir('/home/user/sicav_data/Manip/2016/2016-03/') def getColumn(filename, column): - results = [] - for dat_file in sorted(glob.glob(filename)): - file_result = csv.reader(open(dat_file), delimiter='\t') - results = results + map(float,[result[column] for result in file_result]) - return results + results = [] + for dat_file in sorted(glob.glob(filename)): + file_result = csv.reader(open(dat_file), delimiter='\t') + results = results + map(float,[result[column] for result in file_result]) + return results t = getColumn('*-lakeshore.dat', 0) T1 = getColumn('*-lakeshore.dat', 2) @@ -33,9 +33,9 @@ T3 = [T3[n*i] for i in range(len(T3)/n)] T4 = [T4[n*i] for i in range(len(T4)/n)] def func(U, a0, b1, b2, y0): - sys = signal.lti([a0],[b2, b1, 1]) - y = sys.output(U, t, y0) - return y[1] + sys = signal.lti([a0],[b2, b1, 1]) + y = sys.output(U, t, y0) + return y[1] print('Fitting...') popt, cov = curve_fit(func, T1, T4) diff --git a/first_order_ident.py b/first_order_ident.py index 009c64e..ab62187 100644 --- a/first_order_ident.py +++ b/first_order_ident.py @@ -9,9 +9,9 @@ tic = time.time() '''function to optimize''' def func(u, K, tau, y0): - sys = signal.lti(K, [tau, 1]) - y = sys.output(u, t, y0) - return y[1] + sys = signal.lti(K, [tau, 1]) + y = sys.output(u, t, y0) + return y[1] '''input square signal''' global t -- 2.16.4