From bb530d7dc9c8d77c5c5557aacdb56ee8b7fa9d56 Mon Sep 17 00:00:00 2001 From: gac-x10da Date: Tue, 19 Mar 2019 09:48:31 +0100 Subject: [PATCH] Script execution --- script/XES_W1.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/XES_W1.py b/script/XES_W1.py index ec9c912..b0a8263 100644 --- a/script/XES_W1.py +++ b/script/XES_W1.py @@ -21,7 +21,7 @@ SAI01 = Channel('X10DA-ES1-SAI_01:MEAN', type = 'd') #ScalarDetector SAI02 SAI02 = Channel('X10DA-ES1-SAI_02:MEAN', type = 'd') #ScalarDetector Ring-current -Ring-current = Channel('ARIDI-PCT:CURRENT', type = 'd') +RingCurrent = Channel('ARIDI-PCT:CURRENT', type = 'd') #ScalarDetector PilExpTime PilExpTime = Channel('X10DA-PILATUS-1:cam1:AcquireTime_RBV', type = 'd') #Timestamp Timestamp @@ -50,11 +50,11 @@ for setpoint1 in range(0, 30): cawait('X10DA-PILATUS-1:cam1:Acquire', 0, type = 'l') cawait('X10DA-ES1:SMPL-DONE', 1, type = 'l') sleep(0.1) - detector1 = SAI01-MEAN.get() + detector1 = SAI01.get() #Detector SAI02 detector2 = SAI02.get() #Detector Ring-current - detector3 = Ring-current.get() + detector3 = RingCurrent.get() #Detector PilExpTime detector4 = PilExpTime.get() #Detector Timestamp