From a51294f15712abf93e37b78b829a104857fa2ab2 Mon Sep 17 00:00:00 2001 From: x03daop Date: Fri, 27 Jan 2017 17:53:35 +0100 Subject: [PATCH] Script execution --- script/PhotonFluxSpectrum.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/script/PhotonFluxSpectrum.py b/script/PhotonFluxSpectrum.py index c6cdbfa9..55080a90 100644 --- a/script/PhotonFluxSpectrum.py +++ b/script/PhotonFluxSpectrum.py @@ -8,19 +8,24 @@ AuxCurrent: not connected import time -# G1200 1x1 reference sscan_2264 (elog:114) STARTPOS = (270.0) ENDPOS = (310.0) STEPS = 0.5 LATENCY = 1.0 DWELL = 1.0 -SampleCurrentGain.write("L, 10^8") -RefCurrentGain.write("L, 10^9") -AuxCurrentGain.write("L, 10^7") +# G1200 1x1 reference sscan_2264 (elog:114) +#SampleCurrentGain.write("L, 10^8") +#RefCurrentGain.write("L, 10^9") +#FrontendHSize.write(1.5) +#FrontendVSize.write(1.4) +#ExitSlit.write(100.0) -FrontendHSize.write(1.5) -FrontendVSize.write(1.4) +# G1200 6x10 reference sscan_2266 (elog:116) +SampleCurrentGain.write("L, 10^6") +RefCurrentGain.write("L, 10^8") +FrontendHSize.write(6.5) +FrontendVSize.write(10.4) ExitSlit.write(100.0) def trig(): @@ -30,9 +35,8 @@ def trig(): value = DWELL * 10.0 SampleCurrentAveraging.write(value) RefCurrentAveraging.write(value) -AuxCurrentAveraging.write(value) POSITIONERS = (Eph) -SENSORS = (SampleCurrent, RefCurrent, AuxCurrent, MachineCurrent) +SENSORS = (SampleCurrent, RefCurrent, MachineCurrent) lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout)