From 7b17d26c5862553d59ca5c08f31cefecc90e6dcf Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Mon, 22 Jan 2018 10:54:04 +0100 Subject: [PATCH] Closedown --- config/devices.properties | 2 +- script/scans/6mom.py | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 6164be5..040a687 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,4 +1,4 @@ -$det=Pilatus|X04SA-ES2-PIL|||true +$det=Pilatus|X04SA-ES2-PIL:cam1 X04SA-ES2-PIL:img1|||true scx=ch.psi.pshell.epics.Motor|X04SA-ES2-XYZ:TRX|||true scy=ch.psi.pshell.epics.Motor|X04SA-ES2-XYZ:TRY|||true scz=ch.psi.pshell.epics.Motor|X04SA-ES2-XYZ:TRZ|||true diff --git a/script/scans/6mom.py b/script/scans/6mom.py index 81e99d1..5a65159 100644 --- a/script/scans/6mom.py +++ b/script/scans/6mom.py @@ -1,9 +1,9 @@ -startphi=-60 -endphi=120 # for DACs the middle is 57 +startphi=-10 +endphi=10 # for DACs the middle is 57 time_step=1 step=0.5 # in degrees #fname='testing' -fname='MRc_01' # remember the run number +fname='test6mom' # remember the run number @@ -12,7 +12,7 @@ startphi, endphi, time_step, step = float(startphi), float(endphi), float(time_s scr.setSpeed (5.0) scr.move(startphi) -filt=caget("X04SA-ES2-FI:TRANSM",'d') *1000000000 #TODO:Check if wtiting 1000000000.00000000000000 or 1.0E9 is equivalent +filt=caget("X04SA-ES2-FI:TRANSM",'d') *1000000000 caput("X04SA-ES2-PIL:cam1:FilterTransm",filt) exp_time = time_step -0.003 # calculates Exposure time @@ -81,7 +81,5 @@ scr.waitReady(int(tottime * 1000)) scr.setSpeed (5.0) -#sleep(1.0) #TODO: Using device this is not needed -scr.move(startphi, 20000) -#sleep(16.0) #TODO: Sync move, this is not needed +scr.move(startphi, 30000) #timeout = 30.0s