diff --git a/script/users/Viktor.py b/script/users/Viktor.py index cc594b88..82b3c66c 100644 --- a/script/users/Viktor.py +++ b/script/users/Viktor.py @@ -9,23 +9,24 @@ LATENCY = 0.0 SENSORS = [Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent] Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) -writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy, ManipulatorY) +writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy, ManipulatorZ) adjust_sensors() set_adc_averaging() set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1}) -n = 27 -Estep=5 - -Ystep=0.05 +n = 57 +Estep=0.5 +Zstart=115 +Zstep=-0.05 +Estart=172.0 try: - eph = [170.0 + i * Estep for i in range(n)] - elo = [150.5 + i * Estep for i in range(n)] - ehi = [169.5 + i * Estep for i in range(n)] - y = [3.0 - i * Ystep for i in range(n)] - VECTOR = [[eph[i], elo[i], ehi[i], y[i]] for i in range(len(eph))] + eph = [Estart + i * Estep for i in range(n)] + elo = [Estart-19.5 + i * Estep for i in range(n)] + ehi = [Estart-0.5 + i * Estep for i in range(n)] + z = [Zstart + i * Zstep for i in range(n)] + VECTOR = [[eph[i], elo[i], ehi[i], z[i]] for i in range(len(eph))] vscan(writables, SENSORS, VECTOR, True, LATENCY, False, before_read=before_readout, after_read = after_readout) finally: after_scan()