From cc35db2660a1ea8ca9cefc7c8370dd13c28e3793 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 2 Feb 2018 14:07:14 +0100 Subject: [PATCH] Script execution --- script/optics/PhotonFluxSpectrum.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/script/optics/PhotonFluxSpectrum.py b/script/optics/PhotonFluxSpectrum.py index b60211c0..aab6f5ff 100644 --- a/script/optics/PhotonFluxSpectrum.py +++ b/script/optics/PhotonFluxSpectrum.py @@ -78,22 +78,25 @@ else: def trig(): wait_beam() + print "init" caput(KEI_DIODE + "DOINIT", 1) caput(KEI_RMU + "DOINIT", 1) - time.sleep(0.1) + print "trigger" caput(KEI_DIODE + "DOTRIGGER", 1) caput(KEI_RMU + "DOTRIGGER", 1) caput("X03DA-OP-10ADC:TRG.PROC", 1) #time.sleep(DWELL * 1.1) + print "fetch" caput(KEI_DIODE + "DOFETCH", 1) caput(KEI_RMU + "DOFETCH", 1) + print "done" value = DWELL * 10.0 SampleCurrentAveraging.write(value) RefCurrentAveraging.write(value) POSITIONERS = (Eph) -SENSORS = (Keithley1, SampleCurrent, RefCurrent, MachineCurrent) +SENSORS = (Keithley1, Keithley2, SampleCurrent, RefCurrent, MachineCurrent) lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout)