diff --git a/script/optics/PhotonFluxSpectrum.py b/script/optics/PhotonFluxSpectrum.py index 40011d3b..195dc408 100644 --- a/script/optics/PhotonFluxSpectrum.py +++ b/script/optics/PhotonFluxSpectrum.py @@ -30,7 +30,7 @@ elif RANGE == "C K-edge": STARTPOS = (270.0) ENDPOS = (310.0) STEPS = 0.5 - LATENCY = 5.0 + LATENCY = 1.0 DWELL = 1.0 KEI_DIODE = "X03DA-KEITHLEY-1:" @@ -77,6 +77,7 @@ else: pass def trig(): + time.sleep(LATENCY) wait_beam() print time.asctime() + "init" caput(KEI_DIODE + "DOINIT", 1) @@ -85,7 +86,7 @@ def trig(): caput(KEI_DIODE + "DOTRIGGER", 1) caput(KEI_RMU + "DOTRIGGER", 1) caput("X03DA-OP-10ADC:TRG.PROC", 1) - #time.sleep(DWELL * 1.1) + time.sleep(DWELL) print time.asctime() + "fetch" caput(KEI_DIODE + "DOFETCH", 1) caput(KEI_RMU + "DOFETCH", 1) @@ -98,5 +99,5 @@ RefCurrentAveraging.write(value) POSITIONERS = (Eph) SENSORS = (Keithley1, Keithley2, SampleCurrent, RefCurrent, MachineCurrent) -lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) +lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, 0.0, before_read=trig, after_read=after_readout)