From 7489ee02e587d9b8bb64ab46dc8de8655450b0f8 Mon Sep 17 00:00:00 2001
From: boccioli_m <boccioli_m@PC11577.psi.ch>
Date: Mon, 15 Jun 2015 16:44:14 +0200
Subject: [PATCH] Closedown

---
 script/Motor Test 2.py | 4 +++-
 script/Motor Test 3.py | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/script/Motor Test 2.py b/script/Motor Test 2.py
index d1b9e0e..022b1b1 100644
--- a/script/Motor Test 2.py	
+++ b/script/Motor Test 2.py	
@@ -1,4 +1,6 @@
-#Script imported from: Motor Test 3.xml
+#Script Motor Test 2
+#Go to absolute position A, then move +B steps, then -2B steps, then +2Bsteps (ie oscillate round centre position, logging after each movement); repeat N times 
+
 import traceback
 
 #by default, failed
diff --git a/script/Motor Test 3.py b/script/Motor Test 3.py
index 864e073..4d72dfb 100644
--- a/script/Motor Test 3.py	
+++ b/script/Motor Test 3.py	
@@ -72,13 +72,13 @@ idInkr.put(-100.0, timeout=None) # TODO: Set appropriate timeout
 start = idInkr.get()+direction
 countSteps = 0
 count = 0
-for setpoint1 in range(0, 2):
+for setpoint1 in range(0, 20):
     count = count + 1
     sleep( 2 ) # Settling time
     #RegionPositioner idInkr
     for setpoint2 in frange(start, end, direction):
         readback1 = setpoint1
-        sleep( 0.1 ) # Settling time
+        sleep( 0.2 ) # Settling time
         idInkr.put(setpoint2, timeout=None) # TODO: Set appropriate timeout
         readback2 = idInkr.get()
         if abs(readback2 - setpoint2) > 1 : # TODO: Check accuracy