From 4743f6aaae5daa7556a4d7ccfd30e592d9852ccd Mon Sep 17 00:00:00 2001 From: panepucci Date: Mon, 30 Nov 2015 16:35:31 +0100 Subject: [PATCH] Closedown --- script/fbm.py | 6 ++++-- script/rock.py | 9 ++++----- script/rocknroll.py | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/script/fbm.py b/script/fbm.py index 3d6e3a5..2e3526e 100644 --- a/script/fbm.py +++ b/script/fbm.py @@ -1,5 +1,7 @@ -""" -""" +################################################################################################### +# +################################################################################################### + tc1 = caget('X06DA-OP-MO:TC1') # theta1 thermo couple 1 energy = # Mono energy diff --git a/script/rock.py b/script/rock.py index c2be86e..08542a1 100644 --- a/script/rock.py +++ b/script/rock.py @@ -1,8 +1,7 @@ -""" -PRO ROCK, axis,SILENT = silent,FFAIL = ffail,TIME = tt, SETI0 = seti0, DTHETA = dx, NOREF = noref -Parameters: -axis -""" +################################################################################################### +# PRO ROCK, axis,SILENT = silent,FFAIL = ffail,TIME = tt, SETI0 = seti0, DTHETA = dx, NOREF = noref +# Parameters: axis +################################################################################################### def rock(axis = th1, ffail = False, tt = 0.2, seti0 = False, dx = None, noref = False): diff --git a/script/rocknroll.py b/script/rocknroll.py index 7d6607f..6fc3e97 100644 --- a/script/rocknroll.py +++ b/script/rocknroll.py @@ -7,7 +7,7 @@ run("rock") time.sleep(2.0) by = bpm1.read() -if (math.abs(by) > 0.005): +if (abs(by) > 0.005): print by print 'Beam is not aligned at E-BOX BPM: do fbm.' run("fbm")