From 58ba7ef005d66855a1c3c41f12e3d5eeed8a4cb5 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Fri, 10 May 2019 17:23:09 +0200 Subject: [PATCH] Closedown --- script/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/utils.py b/script/utils.py index 1deb138..1ac32eb 100644 --- a/script/utils.py +++ b/script/utils.py @@ -31,15 +31,15 @@ def convert_file(input_file_name, output_file_name, pol = None): lines = inp.readlines() with open(output_file_name, "wb") as out: (db, st) = ("java.lang.Double", "java.lang.String") - out.write("#Energy" + sep + "Io" + sep + "CADC2" + sep + "CADC3" + sep + "NORMtey" + "Pol" + line_sep) + out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "NORMtey" + "Pol" + line_sep) out.write("#"+ db + sep + db + sep + db + sep + db + sep + db + line_sep) s = sep for line in lines[1:]: line = line.strip() if line=="": break try: - (Ecrbk, CADC1, CADC2, CADC3, CADC4, CADC5, MCurr, cffrbk, IDErbk, NORM, time, MAGX, MAGZ, EXPT) = line.split(" ") - normtey=repr( float(CADC1)/float(CADC2)) + (Ecrbk, CADC1, CADC2, CADC3, CADC4, MCurr, cffrbk, IDErbk, time) = line.split(" ") + normtey=repr( float(CADC3)/float(CADC1)) # normdiode=repr(float(CADC3)/float(CADC2)) out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + normtey + s + str(pol) + line_sep) except: