From 93c8ae2ab3c9b617db892223c782405da69a9723 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Tue, 4 Sep 2018 20:19:29 +0200 Subject: [PATCH] Closedown --- script/FixedE.py | 2 +- script/local.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/FixedE.py b/script/FixedE.py index 45bb240..41fdc31 100644 --- a/script/FixedE.py +++ b/script/FixedE.py @@ -16,7 +16,7 @@ for E in ENERGIES: readback1 = energy.read() if abs(readback1 - E) > 0.1 : # TODO: Check accuracy raise Exception('Energy could not be set to the value ' + str(E)) - sleep( ENERGY_CHANGE_SLEEP ) # Settling time + sleep( 1 ) # Settling time for B in Bpoints: print "Setting field = ", B diff --git a/script/local.py b/script/local.py index 7c56012..e1e6be2 100644 --- a/script/local.py +++ b/script/local.py @@ -74,7 +74,7 @@ def convert_file(input_file_name, output_file_name): try: (Ecrbk,CADC1, CADC2, NORM, CADC3, CADC4, MCurr, cffrbk, ID1Erbk, ID2Erbk, vTime) = line.split(" ") field = caget('X11MA-XMCD:Ireadout') - out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + field + line_sep) + out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + field + line_sep) except: traceback.print_exc()