script/diffcalc/testfivec.py

@@ -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,12 +6,12 @@ run("diffcalc/diffutils")
 #Setup
 ###################################################################################################
 
-setup_diff(fivec, en)
+setup_diff(fivec, energy)
 # Set some limits
-setup_axis('gam', 0, 179)
-setup_axis('delta', 0, 179)
-setup_axis('delta', min=0)
-setup_axis('phi', cut=-180.0)
+setup_axis(gamma, 0, 120)
+setup_axis(delta, 0, 179)
+setup_axis(delta, min=0)
+setup_axis(phi, cut=-180.0)
 
 print_axis_setup()
 
@@ -58,15 +56,15 @@ print  angles_to_hkl((60., 0., 30., 0., 0.))
 print hkl_to_angles(1, 0, 0)
 fivec.write([60, 0, 30, 90, 0])
 print "fivec=" , fivec.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())
 hkl_group.read()