Closedown

This commit is contained in:
2016-02-17 12:08:55 +01:00
parent 004d753fe4
commit 0b90ffd6a8
2 changed files with 4 additions and 3 deletions

View File

@@ -40,9 +40,9 @@ act = 0
# do a setenergy to move theta 1 and 2 to calculated position in case they are not synchronized.
theta1 = caget('X06DA-OP-MO1:ROX1.RBV', 'd')
etheta1 = A2E(abs(theta1),1,1,1,True)
etheta1 = a2e(abs(theta1),1,1,1,True)
theta2 = caget('X06DA-OP-MO1:ROX2.RBV', 'd')
etheta2 = A2E(ABS(theta2),1,1,1,True)
etheta2 = a2e(ABS(theta2),1,1,1,True)
if abs (etheta1-etheta2) > 0.01:
set_energy(e)
@@ -68,7 +68,6 @@ if all:
#-------- rock FIRST crystal until its peak is reached -------------
ff = 1
while ff:
def rock(axis = th1, ffail = False, tt = 0.2, seti0 = False, dx = None, noref = False):
rock() #TODO: #ROCK,1,dt = (dE>1.)*4e-2/e,ffail=ff
# finer final rock

View File

@@ -0,0 +1,2 @@
def seteq(e):
pass