From 1d4c2a82aabb45496c0926fa24980584cf9f660f Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Thu, 17 May 2018 17:18:25 +0200 Subject: [PATCH] Script execution --- script/users/PhotonEnergyManipulator.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/script/users/PhotonEnergyManipulator.py b/script/users/PhotonEnergyManipulator.py index 1fd02e36..bae85e2e 100644 --- a/script/users/PhotonEnergyManipulator.py +++ b/script/users/PhotonEnergyManipulator.py @@ -54,16 +54,14 @@ manip_z = [MANIP_START + MANIP_STEP * i for i in range(NSTEPS)] if MODE == "swept": VECTOR = [[ephot[i], ekin_lo[i], ekin_hi[i], manip_z[i]] for i in range(NSTEPS)] Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) - Scienta.centerEnergy.write(VECTOR[0][1]) - writables = (Eph, Scienta.centerEnergy, ManipulatorZ) -else: - VECTOR = [[ephot[i], ekin_lo[i], manip_z[i]] for i in range(NSTEPS)] - Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed) Scienta.lowEnergy.write(VECTOR[0][1]) Scienta.highEnergy.write(VECTOR[0][2]) writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy, ManipulatorZ) - -print VECTOR +else: + VECTOR = [[ephot[i], ekin_lo[i], manip_z[i]] for i in range(NSTEPS)] + Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed) + Scienta.centerEnergy.write(VECTOR[0][1]) + writables = (Eph, Scienta.centerEnergy, ManipulatorZ) adjust_sensors() set_adc_averaging()