Closedown

2015-12-18 11:53:51 +01:00
parent 9f03c3a03b
commit 6497ef7a57
1 changed files with 11 additions and 10 deletions
@@ -33,15 +33,16 @@ def rock(axis = th1, ffail = False, tt = 0.2, seti0 = False, dx = None, noref =
        print 'fit failed - centering on maximum'
        max_x= xdata[ydata.index(max(ydata))]
        axis.move(max_x)    
-    
-    if seti0 and not ffail:
-        time.sleep(2)
-        run("setI0")    
-    #add after_rock BPM1:SUM as reference for monitoring monochromator thermal drift
-    if (noref==False) and not ffail:
-        time.sleep(3) # wait a bit until mono theta finish moving        
-        br = mono_beam.read()
-        caput('X06DA-OP-MO:MONOBEAM', br)
-        print 'rock_success new mono beam at ' + str(br) + ' at' + str(e) + ' keV'
+        
+    if not ffail:
+        if seti0:
+            time.sleep(2)
+            run("setI0")    
+        #add after_rock BPM1:SUM as reference for monitoring monochromator thermal drift
+        if (noref==False):
+            time.sleep(3) # wait a bit until mono theta finish moving        
+            br = mono_beam.read()
+            caput('X06DA-OP-MO:MONOBEAM', br)
+            print 'rock_success new mono beam at ' + str(br) + ' at' + str(e) + ' keV'