This commit is contained in:
2018-08-24 12:07:28 +02:00
parent 3e41debde1
commit c6cd6123b0
22 changed files with 1010 additions and 132 deletions

View File

@@ -1,6 +1,4 @@
en.move(20.0)
delta.config.maxSpeed = 50.0
delta.speed = 50.0
energy.move(20.0)
delta.move(1.0)
run("diffcalc/diffutils")
@@ -8,11 +6,11 @@ run("diffcalc/diffutils")
#Setup
###################################################################################################
setup_diff(fourc, en)
setup_diff(fourc, energy)
# Set some limits
setup_axis('delta', 0, 179)
setup_axis('delta', min=0)
setup_axis('phi', cut=-180.0)
setup_axis(delta, 0, 179)
setup_axis(delta, min=0)
setup_axis(phi, cut=-180.0)
print_axis_setup()
@@ -47,6 +45,7 @@ ub.checkub()
###################################################################################################
help(hkl.con)
hkl.con('a_eq_b')
#hkl.con('chi',0)
hkl.con()
###################################################################################################\
@@ -56,14 +55,16 @@ print angles_to_hkl((60., 30., 0., 0.))
print hkl_to_angles(1, 0, 0)
fourc.write([60, 30, 90, 0])
print "fourc=" , fourc.position
wl.write(1.0)
print "wl = ", wl.read()
wavelength.write(1.0)
print "wavelength = ", wavelength.read()
"""
# Load the last ub calculation used
ub.lastub()
ub.setu ([[1, 0, 0], [0, 1, 0], [0, 0, 1]])
ub.showref()
ub.swapref(1,2)
"""
#print you.hkl
#pos(get_hkl())
@@ -78,7 +79,7 @@ hkl_group.write([0.0,1.0,1.0])
###################################################################################################\
#Scans
###################################################################################################
#lscan(l, [sin], 1.0, 1.5, 0.1)
#ascan([k,l], [sin], [1.0, 1.0], [1.2, 1.3], [0.1, 0.1], zigzag=True, parallel_positioning = False)
lscan(l, [sin], 1.0, 1.5, 0.1)
ascan([k,l], [sin], [1.0, 1.0], [1.2, 1.3], [0.1, 0.1], zigzag=True, parallel_positioning = False)
vector = [[1.0,1.0,1.0], [1.0,1.0,1.1], [1.0,1.0,1.2], [1.0,1.0,1.4]]
hklscan(vector, [sin, arr])