script/testfourcv.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")
@@ -32,14 +30,13 @@ class FourCircleX04SA_V(YouGeometry):
 ###################################################################################################
 
 #alp, del, gam, ov
-FourCircleX04SA_V()
-setup_diff(fourcv, en, FourCircleX04SA_V())
+setup_diff(fourcv, energy, ("mu", "delta", "gam", "eta"), geometry=FourCircleX04SA_V())
 
 # Set some limits
-setup_axis('delta', 0, 90)
-setup_axis('delta', min=0)
-#setup_axis('gam', 0, 180)
-#setup_axis('eta', cut=-180.0)
+setup_axis(delta, 0, 90)
+setup_axis(delta, min=0)
+#setup_axis(gamma, 0, 180)
+#setup_axis(eta, cut=-180.0)
 
 print_axis_setup()
 
@@ -83,14 +80,16 @@ print  angles_to_hkl((0.0, 60., 0.0, 30.))
 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())