pshell_config/x04sa-es3
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-10-12 11:09:42 +02:00
parent e4d0619188
commit 62885d3281
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/devices.properties
View File

@@ -1,10 +1,10 @@
$omegaV=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAV|||true
$alpha=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:ALPHA|||true
$delta=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:DELTA|||true
$gamma=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:GAMMA|||true
$nu=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:NU|||true
$phi=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:PHI|||true
$omegaH=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAH|||true
omegaV=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAV|||true
alpha=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:ALPHA|||true
delta=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:DELTA|||true
gamma=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:GAMMA|||true
nu=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:NU|||true
phi=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:PHI|||true
omegaH=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAH|||true
current=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT|Read||true
xv=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:XV|||true
y1=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:Y1|||true

11
script/test/TestFourcvCompact.py
View File

@@ -67,9 +67,12 @@ ub.checkub()
#Constraints
###################################################################################################
help(hkl.con)
#hkl.con('a_eq_b')
hkl.con('a_eq_b')
#hkl.con('eta:0')
hkl.con( 'eta', 0)
#hkl.con( 'eta', 0) #OmegaV constant
#hkl.con( 'mu', 20) #Alpha constant
###################################################################################################\
@@ -77,6 +80,6 @@ hkl.con( 'eta', 0)
###################################################################################################
#print angles_to_hkl((16.278, 0.0000, 32.5568, 0.0))
print angles_to_hkl((44.3400, 0.0000, 123.7322 , 0.0))
print hkl_to_angles(2, -2, 10)
#print angles_to_hkl((44.3400, 0.0000, 123.7322 , 0.0))
#print hkl_to_angles(2, -2, 10)

2
script/test/TestLScan.py
View File

@@ -4,5 +4,7 @@ l.move(0.9)
l.write(1.1)
l.waitReady(-1)
print hkl_group.isReady()
#l.write(0.9)
#l.waitReady(-1)