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-08-17 11:31:03 +02:00
parent 152418ee71
commit 3092a65ecc
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/TestFourcv.py
+9 -7
View File
@@ -26,12 +26,12 @@ class FourCircleX04SA_V(YouGeometry):
#Setup
###################################################################################################
#alp, del, gam, ov
#alpha, delta, gamma, omegaV
setup_diff(fourcv, energy, FourCircleX04SA_V())
1/0
#energy.move(20.0)
#delta.config.maxSpeed = 50.0
@@ -40,8 +40,8 @@ setup_diff(fourcv, energy, FourCircleX04SA_V())
# Set some limits
setup_axis('delta', 0, 90)
setup_axis('delta', min=0)
#setup_axis('delta', 0, 90)
#setup_axis('delta', min=0)
#setup_axis('gam', 0, 180)
#setup_axis('eta', cut=-180.0)
@@ -55,7 +55,7 @@ ub.listub()
# Create a new ub calculation and set lattice parameters
ub.newub('test')
ub.setlat('cubic', 1, 1, 1, 90, 90, 90)
ub.setlat('cubic', 5.8361, 5.114, 11.058, 90, 90, 90)
# Add 1st reflection (demonstrating the hardware adapter)
settings.hardware.wavelength = 1
@@ -83,8 +83,10 @@ hkl.con('a_eq_b')
###################################################################################################\
#Motion
###################################################################################################
print angles_to_hkl((0.0, 60., 0.0, 30.))
print hkl_to_angles(1, 0, 0)
print angles_to_hkl((0, 73.72, 0, 32.56))
hkl_to_angles(0, -1, 12)
fourc.write([60, 30, 90, 0])
print "fourc=" , fourc.position
wl.write(1.0)
script/test/TestFourcvTiny.py
+1 -18
View File
@@ -26,25 +26,8 @@ class FourCircleX04SA_V(YouGeometry):
#Setup
###################################################################################################
#alp, del, gam, ov
#alpha, delta, gamma, omegaV
setup_diff(fourcv, energy, FourCircleX04SA_V())
#energy.move(20.0)
#delta.config.maxSpeed = 50.0
#delta.speed 50.0
#delta.move(1.0)
# Set some limits
#setup_axis('delta', 0, 90)
#setup_axis('delta', min=0)
#setup_axis('gam', 0, 180)
#setup_axis('eta', cut=-180.0)
print_axis_setup()
###################################################################################################\