From 5e3f4bfd4cd9cae27b9ce32f8c3d3bc938919654 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 30 Jan 2018 18:32:32 +0100 Subject: [PATCH] Script execution --- script/optics/ExitSlitYScanKei.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/script/optics/ExitSlitYScanKei.py b/script/optics/ExitSlitYScanKei.py index 0458ea0e..9375c737 100644 --- a/script/optics/ExitSlitYScanKei.py +++ b/script/optics/ExitSlitYScanKei.py @@ -20,8 +20,10 @@ KEI_DIODE = "X03DA-KEITHLEY-1:" KEI_RMU = "X03DA-KEITHLEY-2:" caput(KEI_DIODE + "DOSETDEFAULT", 1) +caput(KEI_RMU + "DOSETDEFAULT", 1) time.sleep(1.0) caput(KEI_DIODE + "DOSETADVANCED", 1) +caput(KEI_RMU + "DOSETADVANCED", 1) time.sleep(1.0) #caput(KEI_DIODE + "DATAFORMAT", 1) @@ -40,14 +42,14 @@ time.sleep(0.1) caput(KEI_DIODE + "NAVG", 5) #caput(KEI_DIODE + "TCOUNT", 1) caput(KEI_DIODE + "RANGE", 6) # 200 nA -time.sleep(1.0) #caput(KEI_RMU + "READSCAN.SCAN", 0) #caput(KEI_RMU + "NPLC", 1) -#caput(KEI_RMU + "NAVG", DWELL / 0.02) +caput(KEI_RMU + "NAVG", 5) #caput(KEI_RMU + "TCOUNT", 1) -#caput(KEI_RMU + "RANGE", 8) # 2 nA +caput(KEI_RMU + "RANGE", 8) # 2 nA +time.sleep(1.0) def trig(): wait_beam() @@ -55,15 +57,16 @@ def trig(): #caput(KEI_DIODE + "DOREAD", 1) # 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) - #time.sleep(DWELL * 2) + caput(KEI_RMU + "DOTRIGGER", 1) + time.sleep(DWELL * 1.1) caput(KEI_DIODE + "DOFETCH", 1) - #caput(KEI_RMU + "DOFETCH", 1) + caput(KEI_RMU + "DOFETCH", 1) try: lscan(POSITIONERS, SENSORS, STARTPOS, ENDPOS, STEPS, LATENCY, before_read=trig, after_read=after_readout) finally: caput(KEI_DIODE + "DORESET", 1) + caput(KEI_RMU + "DORESET", 1)