From 0653b8c9cf28d71b633fa45651390ac54aaae461 Mon Sep 17 00:00:00 2001 From: x07maop Date: Fri, 25 Nov 2016 22:30:05 +0100 Subject: [PATCH] Script execution --- script/jan/hyst_Dy_singleenergy.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/script/jan/hyst_Dy_singleenergy.py b/script/jan/hyst_Dy_singleenergy.py index bd7f1b4..83c7706 100644 --- a/script/jan/hyst_Dy_singleenergy.py +++ b/script/jan/hyst_Dy_singleenergy.py @@ -10,7 +10,7 @@ rrate = 2.0 # ramping speed of mag field e1 = 1290.1 # energy 1 (usually on edge) e2 = 1283.0 # energy 2 (pre edge) -B1 = -4.0 # field span +B1 = 4.0 # field span B2 = -B1 nr_loops = 1 # number of loops to acquire @@ -19,16 +19,6 @@ open_valve() loop_count = 0 while loop_count < nr_loops: - - set_pol_cminus(offset = off_cminus) - set_file('Dy_hyst_minus') - hyst_cont(field_x, B1, B2, rrate, [e1]) - - set_pol_cminus(offset = off_cminus) - set_file('Dy_hyst_minus') - hyst_cont(field_x, B2, B1, rrate, [e1]) - - set_pol_cplus(offset = off_cplus) set_file('Dy_hyst_plus') @@ -38,16 +28,13 @@ while loop_count < nr_loops: set_file('Dy_hyst_plus') hyst_cont(field_x, B2, B1, rrate, [e1]) - set_pol_cminus(offset = off_cminus) - set_file('Dy_hyst_minus') - hyst_cont(field_x, B2, B1, rrate, [e1]) - set_pol_cminus(offset = off_cminus) set_file('Dy_hyst_minus') hyst_cont(field_x, B1, B2, rrate, [e1]) - - + set_pol_cminus(offset = off_cminus) + set_file('Dy_hyst_minus') + hyst_cont(field_x, B2, B1, rrate, [e1]) loop_count = loop_count + 1 print "Loop # ",loop_count," finished."