diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 8bd4ed8..c5b2084 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -47,6 +47,7 @@ def update_plot(): print "\nStarting energy scan - Parameters: ", print E1,E2,TIME,DELAY,str(MODE) ,str(OFFSET) ,str(FOLDER) ,str(FILE) ,str(ALPHA) +print pol_mode start = time.localtime() diff --git a/script/Fe_hyst.py b/script/Fe_hyst.py index e96b333..11d69fe 100644 --- a/script/Fe_hyst.py +++ b/script/Fe_hyst.py @@ -22,7 +22,7 @@ set_file('Fe_hyst_plus') hyst_cont(field_x, 6.8, -6.8, 2.0, [708.6, 703.7]) set_pol_cminus(offset = 1.5) -set_file('Fe_hyst_plus') +set_file('Fe_hyst_minus') hyst_cont(field_x, -6.8, 6.8, 2.0, [708.6, 703.7]) ''' set_pol_cminus(offset = 1.5) diff --git a/script/Mn+Fe_hyst.py b/script/Mn+Fe_hyst.py index 1352c5e..8bdfa39 100644 --- a/script/Mn+Fe_hyst.py +++ b/script/Mn+Fe_hyst.py @@ -1,5 +1,5 @@ open_valve() -''' + set_pol_cminus(offset = 1.0) set_file('Mn_hyst_minus') hyst_cont(field_x, 6.8, -6.8, 2.0, [639.1, 636.0]) @@ -16,6 +16,10 @@ set_pol_cminus(offset = 1.5) set_file('Fe_hyst_minus') hyst_cont(field_x, -6.8, 6.8, 2.0, [707.25, 703.6]) +set_pol_cplus(offset = -1.0) +set_file('Mn_hyst_plus') +hyst_cont(field_x, 6.8, -6.8, 2.0, [639.1, 636.0]) + set_pol_cminus(offset = 1.0) set_file('Mn_hyst_minus') hyst_cont(field_x, -6.8, 6.8, 2.0, [639.1, 636.0]) @@ -27,11 +31,6 @@ hyst_cont(field_x, 6.8, -6.8, 2.0, [707.25, 703.6]) set_pol_cplus(offset = -0.5) set_file('Fe_hyst_plus') hyst_cont(field_x, -6.8, 6.8, 2.0, [707.25, 703.6]) -''' -set_pol_cplus(offset = -1.0) -set_file('Mn_hyst_plus') -hyst_cont(field_x, 6.8, -6.8, 2.0, [639.1, 636.0]) - close_valve()