pshell_config/x04sa-es2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x04sa
2018-01-22 10:54:04 +01:00
parent 3a03c3c405
commit 7b17d26c58
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+1 -1
View File
@@ -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
script/scans/6mom.py
+5 -7
View File
@@ -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