From 7f3e17d86d55e529d62e383151f47be893584c33 Mon Sep 17 00:00:00 2001
From: panepucci <ezequiel.panepucci@psi.ch>
Date: Tue, 1 Dec 2015 11:05:44 +0100
Subject: [PATCH] Closedown

---
 script/fbm.py   | 14 +++++++-------
 script/local.py | 24 ++++++++++++++++++------
 script/rock.py  |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/script/fbm.py b/script/fbm.py
index 52e6b7d..bb718d8 100644
--- a/script/fbm.py
+++ b/script/fbm.py
@@ -60,18 +60,18 @@ while abs(by) >= ymax :
     by	=	bpm1.read()
     print "current EBOX-POSV: " + str(by) 
     cur = caget('X06DA-ES-BPM1:SUM','d')
-	if cur > tc:
-		ehs = caget('X06DA-OP-ST1:OPEN_EPS','i')  # make sure that shutter is open
-		if (ehs > 0) and (abs(by) > ymax):
-			if abs(by) > (50*ymax):
-				raise Exception ('TODO')
+    if cur > tc:
+        ehs = caget('X06DA-OP-ST1:OPEN_EPS','i')  # make sure that shutter is open
+        if (ehs > 0) and (abs(by) > ymax):
+            if abs(by) > (50*ymax):
+                raise Exception ('TODO')
             #limit mirror TRY3 movement
             y3 = try3.read()
             if abs(y3i - y3 - 1e-4 * round(by/1e-3)) > 0.008:
                 raise Exception ('Feedback trying to move mirror Y3 beyond safe limit')
             try3.motor.moveRel(-1e-4 * round(by/1e-3))
-            print, "current X06DA-OP-MI1:TRY3", y3
-	    time.sleep(0.25)
+            print "current X06DA-OP-MI1:TRY3: ", y3
+        time.sleep(0.25)
 
 
 print "TRY3 net movement: " + str(y3i-try3.read())    #print how much TRY3 moved
diff --git a/script/local.py b/script/local.py
index 3062739..1d53ba3 100644
--- a/script/local.py
+++ b/script/local.py
@@ -60,9 +60,21 @@ def fit(ydata, xdata = None):
 #fit([1,2,3, 3,3,3,4,5,6,12,33,23,15,3,2,1, 1, 1, 1, 1])        
 
 
-#def rock(axis = th1):
-#    """
-#    TODO
-#    """
-#    run("rock", {"rock_axis":th1})
-from rock import rock
\ No newline at end of file
+def rock(axis = th1):
+    """
+    TODO
+    """
+    run("rock", {"rock_axis":th1})
+
+def fbm():
+    """
+    TODO
+    """
+    run("fbn")
+
+def rocknroll():
+    """
+    TODO
+    """
+    run("rocknroll")
+    
\ No newline at end of file
diff --git a/script/rock.py b/script/rock.py
index 68444a3..239f977 100644
--- a/script/rock.py
+++ b/script/rock.py
@@ -52,4 +52,4 @@ def rock(axis = th1, ffail = False, tt = 0.2, seti0 = False, dx = None, noref =
 
 
 
-#rock(rock_axis)
+rock(rock_axis)