From bf37d46fb534725fa8d9f74cad9e6ba574c0b4c3 Mon Sep 17 00:00:00 2001 From: x03daop Date: Sat, 22 Jul 2017 03:11:44 +0200 Subject: [PATCH] Script execution --- script/users/HoloScan-Yasmine.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/users/HoloScan-Yasmine.py b/script/users/HoloScan-Yasmine.py index f5a59b45..45d2960b 100644 --- a/script/users/HoloScan-Yasmine.py +++ b/script/users/HoloScan-Yasmine.py @@ -17,7 +17,7 @@ LATENCY = 0.0 SENSORS = [Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent] Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) -writables = (ManipulatorTheta) +writables = (ManipulatorTheta, ManipulatorX, ManipulatorY) adjust_sensors() SampleCurrentAveraging.write(10) @@ -32,8 +32,8 @@ try: #phi = [0.5 for i in range(NPOINTS)] phi=30.5 theta = [i * 1.0 - 9.0 for i in range(NPOINTS)] - x = [3.0 * math.cos((th+9.0) * math.pi/180.0) - 1.69 th for th in theta] - y = [3.0 * math.sin((th+9.0) * math.pi/180.0) - 0.933 th for th in theta] + x = [3.0 * math.cos((th+9.0) * math.pi/180.0) - 1.69 for th in theta] + y = [3.0 * math.sin((th+9.0) * math.pi/180.0) - 0.933 for th in theta] #x = [0.65] #y = [0.0179 * th for th in theta] #VECTOR = [phi, theta, x, y]