Closedown

script/rock.py

@@ -25,10 +25,10 @@ def rock(axis = th1, ffail = False, tt = 0.2, seti0 = False, dx = None, noref =
     #time stamp
     print time.strftime('%X %x')
 
-    
     #MVR,axis,-dx
     #SCAN,axis,0,2*dx,20,/fit,/centre,SILENT = silent,FFAIL = ffail,time=tt,/deriv,$
     #data=d
+    lscan(axis, beam_ref, -dx, dx, 20, latency = 0.3, relative = True, context = None, before_read = None, after_read = None)
     LSCAN()
 
     if seti0 and not ffail:
@@ -37,7 +37,10 @@ def rock(axis = th1, ffail = False, tt = 0.2, seti0 = False, dx = None, noref =
 
     #add after_rock BPM1:SUM as reference for monitoring monochromator thermal drift
     if (noref==False) and not ffail:
-        ime.sleep(3) # wait a bit until mono theta finish moving
-        beam_ref = caget('X06DA-OP-BPM1:SUM', 'd')
+        ime.sleep(3) # wait a bit until mono theta finish moving        
         caput('X06DA-OP-MO:MONOBEAM', beam_ref)
-        print 'rock_success new mono beam at ' + str(beam_ref) + ' at' + str(e) + ' keV'
+        print 'rock_success new mono beam at ' + str(beam_ref.read()) + ' at' + str(e) + ' keV'
+
+
+
+rock(rock_axis)

script/rocknroll.py

@@ -1,7 +1,7 @@
 ei = get_energy()
 if ei < 6.0:
     print "No rocking optimization for lower energy for 3rd harmonics rejection'
-run("rock")
+run("rock", {"rock_axis":th1})
 
 #check beam position at EBOX and fbm if needed
 time.sleep(2.0)