Reindent *.py with reindent.py

This commit is contained in:
Douglas Clowes
2014-07-04 11:28:11 +10:00
parent 7129c0608b
commit 522a5544a8
12 changed files with 635 additions and 638 deletions

View File

@@ -9,11 +9,11 @@ import matplotlib.pyplot as plt
import argparse
def make_delta(q):
delta_q = np.zeros(len(q))
delta_q[0] = 0.0
for i in range(1, len(q)):
delta_q[i] = q[i] - q[i - 1]
return delta_q
delta_q = np.zeros(len(q))
delta_q[0] = 0.0
for i in range(1, len(q)):
delta_q[i] = q[i] - q[i - 1]
return delta_q
parser = argparse.ArgumentParser()
parser.add_argument("csv_file", help="TrackingFile.csv", nargs="?")
@@ -28,10 +28,10 @@ data = np.loadtxt(csv_file, delimiter=",", skiprows=1, unpack=True)
t, p, s, c = data
if False:
print dir(data)
#print data.T
print len(data)
print len(t)
print dir(data)
#print data.T
print len(data)
print len(t)
delta_t = make_delta(t)
delta_p = make_delta(p)
@@ -50,15 +50,15 @@ print "StepsPerCount: %.6f" % steps_per_count
delta_spc = np.zeros(len(t))
for i in range(len(delta_spc)):
if delta_c[i] == 0:
delta_spc[i] = 0
else:
delta_spc[i] = delta_s[i] / delta_c[i]
if delta_c[i] == 0:
delta_spc[i] = 0
else:
delta_spc[i] = delta_s[i] / delta_c[i]
if False:
print len(t), len(delta_s), len(delta_spc)
print delta_spc
for i in range(len(t)):
print "%4d: %18.6f %18.6f %18.6f %18.6f %18.6f" % (i, t[i], delta_t[i], delta_s[i], delta_c[i], delta_spc[i])
print len(t), len(delta_s), len(delta_spc)
print delta_spc
for i in range(len(t)):
print "%4d: %18.6f %18.6f %18.6f %18.6f %18.6f" % (i, t[i], delta_t[i], delta_s[i], delta_c[i], delta_spc[i])
ax1.plot(p, delta_spc - steps_per_count, c='r', label='delta steps per count')
ax1.plot(p, (s - s[0])/(c - c[0]) - steps_per_count, c='b', label='steps / counts')