This commit is contained in:
gac-x11ma
2017-12-11 18:14:39 +01:00
parent ad96ff4993
commit db98fb1437
3 changed files with 10 additions and 8 deletions
+7 -5
View File
@@ -37,9 +37,11 @@ set_preference(Preference.ENABLED_PLOTS, ['energy', 'tey_norm'])
set_preference(Preference.PLOT_TYPES, {'tey_norm':1})
scan1 = ManualScan(['Energy', 'Field'], ['TEY', 'I0', 'polarization', 'RingCurrent', 'tey_norm'] , [min(setpoints), min(fields)], [max(setpoints), max(fields)], [len(setpoints)-1, len(fields)-1])
scan1.start()
scan2 = ManualScan(['Energy', 'Field'], ['TEY', 'I0', 'polarization', 'RingCurrent', 'tey_norm'] , [min(setpoints), min(fields)], [max(setpoints), max(fields)], [len(setpoints)-1, len(fields)-1])
set_exec_pars(line_plots = (ai1, ai2))
scan1.start()
scan2.start()
# Main loop
@@ -78,10 +80,10 @@ for E in setpoints:
elif detector4 == 'CIRC -': detector4 = 2
else: detector4 = 0
if(H>0):
if H > 0:
scan1.append ([E, H], [readback1, readback2], [detector1, detector2, detector4, detector7, tey_norm])
if(H<0):
if H < 0:
scan2.append ([E, H], [readback1, readback2], [detector1, detector2, detector4, detector7, tey_norm])
scan1.end()
scan2.end()
scan2.end()