From 87daba4e3f0ae07be3dc887e379fc0f8ad7af1ea Mon Sep 17 00:00:00 2001 From: panepucci Date: Mon, 30 Nov 2015 18:49:43 +0100 Subject: [PATCH] Closedown --- script/rock.py | 11 +++++++---- script/rocknroll.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/script/rock.py b/script/rock.py index 08542a1..4948790 100644 --- a/script/rock.py +++ b/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) diff --git a/script/rocknroll.py b/script/rocknroll.py index 6fc3e97..a2b716d 100644 --- a/script/rocknroll.py +++ b/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)