From ebcb32199be0fa805d0b42929a4f9cc3a278f044 Mon Sep 17 00:00:00 2001 From: x07maop Date: Mon, 28 Nov 2016 10:09:36 +0100 Subject: [PATCH] Closedown --- script/users/Jan/E_N_LD.py | 15 ++++++++------- script/users/Stefano/NE_0.xml | 3 ++- script/users/Stefano/X07MA.xml | 7 +++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/script/users/Jan/E_N_LD.py b/script/users/Jan/E_N_LD.py index 91ace30..8c6958a 100644 --- a/script/users/Jan/E_N_LD.py +++ b/script/users/Jan/E_N_LD.py @@ -9,16 +9,17 @@ mode = "LINEAR" fname0 = "NE_0" fname90= "NE_90" -if energy_readback.read() > 699: - set_energy(600) -if energy_readback.read() > 599: - set_energy(500) -if energy_readback.read() > 499: - set_energy(400) +#if energy_readback.read() > 699: +# set_energy(600) +#if energy_readback.read() > 599: +# set_energy(500) +#if energy_readback.read() > 499: +# set_energy(400) set_slit(10.0) #set_har(1) -#open_valve() +time.sleep(0.2) +open_valve() otf(start, end, time, delay, mode, offset = off_l0, alpha = 0, name = fname0 ) diff --git a/script/users/Stefano/NE_0.xml b/script/users/Stefano/NE_0.xml index f444366..fdb4112 100644 --- a/script/users/Stefano/NE_0.xml +++ b/script/users/Stefano/NE_0.xml @@ -8,6 +8,8 @@ + + @@ -18,6 +20,5 @@ - diff --git a/script/users/Stefano/X07MA.xml b/script/users/Stefano/X07MA.xml index f444366..9885e7b 100644 --- a/script/users/Stefano/X07MA.xml +++ b/script/users/Stefano/X07MA.xml @@ -4,9 +4,9 @@ - + - + @@ -14,10 +14,9 @@ - + -