From 224714aa150e889e34942b9012bf144b7047a9f3 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 2 Feb 2018 15:29:28 +0100 Subject: [PATCH] Script execution --- script/optics/PhotonFluxSpectrum.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/script/optics/PhotonFluxSpectrum.py b/script/optics/PhotonFluxSpectrum.py index 195dc408..528e5d03 100644 --- a/script/optics/PhotonFluxSpectrum.py +++ b/script/optics/PhotonFluxSpectrum.py @@ -27,9 +27,9 @@ elif RANGE == "G1200 full": DWELL = 1.0 elif RANGE == "C K-edge": # carbon edge - STARTPOS = (270.0) - ENDPOS = (310.0) - STEPS = 0.5 + STARTPOS = (250.0) + ENDPOS = (330.0) + STEPS = 0.2 LATENCY = 1.0 DWELL = 1.0 @@ -79,18 +79,14 @@ else: def trig(): time.sleep(LATENCY) wait_beam() - print time.asctime() + "init" caput(KEI_DIODE + "DOINIT", 1) caput(KEI_RMU + "DOINIT", 1) - print time.asctime() + "trigger" caput(KEI_DIODE + "DOTRIGGER", 1) caput(KEI_RMU + "DOTRIGGER", 1) caput("X03DA-OP-10ADC:TRG.PROC", 1) time.sleep(DWELL) - print time.asctime() + "fetch" caput(KEI_DIODE + "DOFETCH", 1) caput(KEI_RMU + "DOFETCH", 1) - print time.asctime() + "done" value = DWELL * 10.0 SampleCurrentAveraging.write(value)