blacken more code

3 files changed, 95 insertions, 73 deletions

diff --git a/bin/cal-hist b/bin/cal-hist
index 07ab597..a92ae1e 100755
--- a/bin/cal-hist
+++ b/bin/cal-hist
@@ -18,50 +18,74 @@ mim = MIMOSA(voltage, shunt)
 
 charges, triggers = mim.load_data(mimfile)
 trigidx = mim.trigger_edges(triggers)
-cal_edges = mim.calibration_edges(running_mean(mim.currents_nocal(charges[0:trigidx[0]]), 10))
+cal_edges = mim.calibration_edges(
+    running_mean(mim.currents_nocal(charges[0 : trigidx[0]]), 10)
+)
+
+# charges = charges[charges > 20000]
+# charges = charges[charges < 21000]
 
-#charges = charges[charges > 20000]
-#charges = charges[charges < 21000]
 
 def show_hist(data):
-	bins = np.max(data) - np.min(data)
-	if bins == 0:
-		bins = 1
-	if bins > 1000:
-		bins = bins / 10
-	#bins = 500
-	n, bins, patches = plt.hist(data, bins, normed=0, facecolor='green', alpha=0.75)
-	plt.grid(True)
-	plt.show()
-	print(np.histogram(data, bins=bins))
+    bins = np.max(data) - np.min(data)
+    if bins == 0:
+        bins = 1
+    if bins > 1000:
+        bins = bins / 10
+    # bins = 500
+    n, bins, patches = plt.hist(data, bins, normed=0, facecolor="green", alpha=0.75)
+    plt.grid(True)
+    plt.show()
+    print(np.histogram(data, bins=bins))
+
 
-#show_hist(charges[cal_edges[0]:cal_edges[1]])
-#show_hist(charges[cal_edges[4]:cal_edges[5]])
-#show_hist(charges[cal_edges[2]:cal_edges[3]])
-#show_hist(charges[trigidx[7]:trigidx[8]])
-#show_hist(np.array(charges))
+# show_hist(charges[cal_edges[0]:cal_edges[1]])
+# show_hist(charges[cal_edges[4]:cal_edges[5]])
+# show_hist(charges[cal_edges[2]:cal_edges[3]])
+# show_hist(charges[trigidx[7]:trigidx[8]])
+# show_hist(np.array(charges))
 
-#print(charges[cal_edges[0]:cal_edges[1]])
-#print(charges[cal_edges[4]:cal_edges[5]])
-#print(charges[cal_edges[2]:cal_edges[3]])
+# print(charges[cal_edges[0]:cal_edges[1]])
+# print(charges[cal_edges[4]:cal_edges[5]])
+# print(charges[cal_edges[2]:cal_edges[3]])
 
-plt.hist(mim.charge_to_current_nocal(charges[cal_edges[2]:cal_edges[3]]) * 1e-3, 100, normed=0, facecolor='blue', alpha=0.8)
-plt.xlabel('mA MimosaCMD')
-plt.ylabel('#')
+plt.hist(
+    mim.charge_to_current_nocal(charges[cal_edges[2] : cal_edges[3]]) * 1e-3,
+    100,
+    normed=0,
+    facecolor="blue",
+    alpha=0.8,
+)
+plt.xlabel("mA MimosaCMD")
+plt.ylabel("#")
 plt.grid(True)
 plt.show()
-plt.hist(mim.charge_to_current_nocal(charges[cal_edges[4]:cal_edges[5]]) * 1e-3, 100, normed=0, facecolor='blue', alpha=0.8)
-plt.xlabel('mA MimosaCMD')
-plt.ylabel('#')
+plt.hist(
+    mim.charge_to_current_nocal(charges[cal_edges[4] : cal_edges[5]]) * 1e-3,
+    100,
+    normed=0,
+    facecolor="blue",
+    alpha=0.8,
+)
+plt.xlabel("mA MimosaCMD")
+plt.ylabel("#")
 plt.grid(True)
 plt.show()
-plt.hist(mim.charge_to_current_nocal(charges[cal_edges[0]:cal_edges[1]]) * 1e-3, 100, normed=0, facecolor='blue', alpha=0.8)
-plt.xlabel('mA MimosaCMD')
-plt.ylabel('#')
+plt.hist(
+    mim.charge_to_current_nocal(charges[cal_edges[0] : cal_edges[1]]) * 1e-3,
+    100,
+    normed=0,
+    facecolor="blue",
+    alpha=0.8,
+)
+plt.xlabel("mA MimosaCMD")
+plt.ylabel("#")
 plt.grid(True)
 plt.show()
-plt.hist(charges[cal_edges[0]:cal_edges[1]], 100, normed=0, facecolor='blue', alpha=0.8)
-plt.xlabel('Rohwert MimosaCMD')
-plt.ylabel('#')
+plt.hist(
+    charges[cal_edges[0] : cal_edges[1]], 100, normed=0, facecolor="blue", alpha=0.8
+)
+plt.xlabel("Rohwert MimosaCMD")
+plt.ylabel("#")
 plt.grid(True)
 plt.show()
diff --git a/bin/gradient b/bin/gradient
index 0409c38..ca60949 100755
--- a/bin/gradient
+++ b/bin/gradient
@@ -17,17 +17,17 @@ mimfile = sys.argv[3]
 mim = MIMOSA(voltage, shunt)
 
 charges, triggers = mim.load_file(mimfile)
-#charges = charges[2000000:3000000]
+# charges = charges[2000000:3000000]
 
 currents = running_mean(mim.charge_to_current_nocal(charges), 10) * 1e-6
 xr = np.arange(len(currents)) * 1e-5
 threshold = 1e-5
 grad = np.gradient(currents, 2)
 tp = np.abs(grad) > threshold
-plt.plot( xr, currents, "r-")
-plt.plot( xr, grad, "y-")
-plt.plot( xr[tp], grad[tp], "bo")
-plt.xlabel('Zeit [s]')
-plt.ylabel('Strom [A]')
+plt.plot(xr, currents, "r-")
+plt.plot(xr, grad, "y-")
+plt.plot(xr[tp], grad[tp], "bo")
+plt.xlabel("Zeit [s]")
+plt.ylabel("Strom [A]")
 plt.grid(True)
 plt.show()
diff --git a/bin/mimplot b/bin/mimplot
index 0d4ba0e..a55a875 100755
--- a/bin/mimplot
+++ b/bin/mimplot
@@ -14,49 +14,47 @@ from dfatool.utils import running_mean
 
 opt = dict()
 
-if __name__ == '__main__':
+if __name__ == "__main__":
 
-	try:
-		optspec = (
-			'export= '
-		)
+    try:
+        optspec = "export= "
 
-		raw_opts, args = getopt.getopt(sys.argv[1:], '', optspec.split())
+        raw_opts, args = getopt.getopt(sys.argv[1:], "", optspec.split())
 
-		for option, parameter in raw_opts:
-			optname = re.sub(r'^--', '', option)
-			opt[optname] = parameter
+        for option, parameter in raw_opts:
+            optname = re.sub(r"^--", "", option)
+            opt[optname] = parameter
 
-		if 'export' in opt:
-			opt['export'] = list(map(int, opt['export'].split(':')))
+        if "export" in opt:
+            opt["export"] = list(map(int, opt["export"].split(":")))
 
-	except getopt.GetoptError as err:
-		print(err)
-		sys.exit(2)
+    except getopt.GetoptError as err:
+        print(err)
+        sys.exit(2)
 
-	voltage = float(args[0])
-	shunt = float(args[1])
-	mimfile = args[2]
+    voltage = float(args[0])
+    shunt = float(args[1])
+    mimfile = args[2]
 
-	mim = MIMOSA(voltage, shunt)
+    mim = MIMOSA(voltage, shunt)
 
-	charges, triggers = mim.load_file(mimfile)
-	charges = charges[:3000000]
+    charges, triggers = mim.load_file(mimfile)
+    charges = charges[:3000000]
 
-	currents = running_mean(mim.charge_to_current_nocal(charges), 10) * 1e-6
-	powers = currents * voltage
-	xr = np.arange(len(currents)) * 1e-5
+    currents = running_mean(mim.charge_to_current_nocal(charges), 10) * 1e-6
+    powers = currents * voltage
+    xr = np.arange(len(currents)) * 1e-5
 
-	if 'export' in opt:
-		xr = xr[opt['export'][0] : opt['export'][1]]
-		currents = currents[opt['export'][0] : opt['export'][1]]
-		powers = powers[opt['export'][0] : opt['export'][1]]
+    if "export" in opt:
+        xr = xr[opt["export"][0] : opt["export"][1]]
+        currents = currents[opt["export"][0] : opt["export"][1]]
+        powers = powers[opt["export"][0] : opt["export"][1]]
 
-		for pair in zip(xr, powers):
-			print('{} {}'.format(*pair))
+        for pair in zip(xr, powers):
+            print("{} {}".format(*pair))
 
-	plt.plot( xr, powers, "r-")
-	plt.xlabel('Time [s]')
-	plt.ylabel('Power [W]')
-	plt.grid(True)
-	plt.show()
+    plt.plot(xr, powers, "r-")
+    plt.xlabel("Time [s]")
+    plt.ylabel("Power [W]")
+    plt.grid(True)
+    plt.show()