From f1351355c9aa3e64137e488bbba5aa2207bb446b Mon Sep 17 00:00:00 2001
From: gac-x10da <gac-x10da@x10da-cons-1.psi.ch>
Date: Tue, 19 Mar 2019 09:52:53 +0100
Subject: [PATCH] Script execution

---
 script/PumpProbeXES_W1.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/script/PumpProbeXES_W1.py b/script/PumpProbeXES_W1.py
index 5d78466..cdef701 100644
--- a/script/PumpProbeXES_W1.py
+++ b/script/PumpProbeXES_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
@@ -52,11 +52,11 @@ for setpoint1 in range(0, 30):
     cawait('X10DA-ES1:SMPL-DONE', 1, type = 'l')
     sleep(0.1)
     
-    detector1On = SAI01-MEAN.get()
+    detector1On = SAI01.get()
     #Detector SAI02
     detector2On = SAI02.get()
     #Detector Ring-current
-    detector3On = Ring-current.get()
+    detector3On = RingCurrent.get()
     #Detector PilExpTime
     detector4On = PilExpTime.get()
     #Detector Timestamp
@@ -85,11 +85,11 @@ for setpoint1 in range(0, 30):
     cawait('X10DA-ES1:SMPL-DONE', 1, type = 'l')
     sleep(0.1)
     
-    detector1Off = SAI01-MEAN.get()
+    detector1Off = SAI01.get()
     #Detector SAI02
     detector2Off = SAI02.get()
     #Detector Ring-current
-    detector3Off = Ring-current.get()
+    detector3Off = RingCurrent.get()
     #Detector PilExpTime
     detector4Off = PilExpTime.get()
     #Detector Timestamp
@@ -114,9 +114,9 @@ for setpoint1 in range(0, 30):
     scan.append ([setpoint1], [readback1], [detector1On, detector1Off, detector2On, detector2Off, detector3On, detector3Off, detector4On, detector4Off, detector5On, detector5Off, detector6On,detector6Off, detector7On, detector7Off, detector8On, detector8Off, detector9On, detector9Off, detector10On, detector10Off, detector11On, detector11Off,detector9Diff,detector10Diff,detector11Diff])
 
 #Closing channels
-SAI01-MEAN.close()
+SAI01.close()
 SAI02.close()
-Ring-current.close()
+RingCurrent.close()
 PilExpTime.close()
 PilFileNum.close()
 TotalCounts.close()