From 20544a84340ff3d7df60675a44ceba2516f6f1f3 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 2 Feb 2018 12:58:47 +0100 Subject: [PATCH] Script execution --- script/optics/PhotonFluxSpectrum.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/script/optics/PhotonFluxSpectrum.py b/script/optics/PhotonFluxSpectrum.py index 9d7419aa..5fec262e 100644 --- a/script/optics/PhotonFluxSpectrum.py +++ b/script/optics/PhotonFluxSpectrum.py @@ -55,7 +55,7 @@ elif BEAM == "G1200 1x1": SampleCurrentGain.write("L, 10^7") RefCurrentGain.write("L, 10^9") caput(KEI_DIODE + "RANGE", 6) # 200 nA - caput(KEI_RMU + "RANGE", 8) # 2 nA + #caput(KEI_RMU + "RANGE", 8) # 2 nA FrontendHSize.write(1.5) FrontendVSize.write(1.4) ExitSlit.write(100.0) @@ -73,20 +73,21 @@ else: def trig(): wait_beam() caput(KEI_DIODE + "DOINIT", 1) - caput(KEI_RMU + "DOINIT", 1) + #caput(KEI_RMU + "DOINIT", 1) time.sleep(0.1) caput(KEI_DIODE + "DOTRIGGER", 1) - caput(KEI_RMU + "DOTRIGGER", 1) + #caput(KEI_RMU + "DOTRIGGER", 1) caput("X03DA-OP-10ADC:TRG.PROC", 1) time.sleep(DWELL * 1.1) caput(KEI_DIODE + "DOFETCH", 1) - caput(KEI_RMU + "DOFETCH", 1) + #caput(KEI_RMU + "DOFETCH", 1) value = DWELL * 10.0 SampleCurrentAveraging.write(value) RefCurrentAveraging.write(value) POSITIONERS = (Eph) -SENSORS = (Keithley1, Keithley2, SampleCurrent, RefCurrent, MachineCurrent) +SENSORS = (Keithley1, SampleCurrent, RefCurrent, MachineCurrent) lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) +after_scan()