diff --git a/script/jan/hyst_Dy_singleenergy.py b/script/jan/hyst_Dy_singleenergy.py index 2b7d88f..7b7c1c0 100644 --- a/script/jan/hyst_Dy_singleenergy.py +++ b/script/jan/hyst_Dy_singleenergy.py @@ -1,5 +1,5 @@ -off_cplus = -6.5 -off_cminus = -2.5 +off_cplus = -7.5 +off_cminus = -3.0 rrate = 2.0 # ramping speed of mag field # normal incidence @@ -7,10 +7,10 @@ rrate = 2.0 # ramping speed of mag field #e2 = 1283.0 # energy 2 (pre edge) # grazing incidence -e1 = 1290.2 # energy 1 (usually on edge) +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 @@ -36,21 +36,7 @@ while loop_count < nr_loops: set_file('Dy_hyst_plus') hyst_cont(field_x, B2, B1, rrate, [e1]) - set_pol_cplus(offset = off_cplus) - set_file('Dy_hyst_plus') - hyst_cont(field_x, B1, B2, rrate, [e2]) - - set_pol_cminus(offset = off_cminus) - set_file('Dy_hyst_minus') - hyst_cont(field_x, B2, B1, rrate, [e2]) - - set_pol_cminus(offset = off_cminus) - set_file('Dy_hyst_minus') - hyst_cont(field_x, B1, B2, rrate, [e2]) - - set_pol_cplus(offset = off_cplus) - set_file('Dy_hyst_plus') - hyst_cont(field_x, B2, B1, rrate, [e2]) + loop_count = loop_count + 1 print "Loop # ",loop_count," finished."