From 04aef531d5189456538e320b673cc85652aa4433 Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Wed, 18 Apr 2018 11:24:09 +0200 Subject: [PATCH] Closedown --- script/test/TestDiffcalc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/test/TestDiffcalc.py b/script/test/TestDiffcalc.py index 6adfac5..10f16a1 100644 --- a/script/test/TestDiffcalc.py +++ b/script/test/TestDiffcalc.py @@ -10,8 +10,8 @@ setup_diff(sixch, energy) #Setup setup_axis('gam', 0, 179) -setup_axis('del', 0, 179) -setup_axis('del', min=0) +setup_axis('delta', 0, 179) +setup_axis('delta', min=0) setup_axis('phi', cut=-180.0) print_axis_setup() @@ -28,7 +28,7 @@ settings.hardware.position = 0.0, 45.0, 0.0, 0.225, -4.1, -0.1476 ub.addref([1, 0, 0])# energy and position from hardware # Add 2nd reflection (this time without the harware adapter) ub.c2th([0, 1, 0], 12.39842) -ub.addref([0, 1, 0], [0.0, 45.0, 0, 0.225, -4.1, -0.1476], 12.39842) +ub.addref([0, 1, 0], [0.0, 45.0, 0.0, 0.225, -4.1, 0.0], 12.39842) # check the state ub.ub() @@ -44,9 +44,9 @@ hkl.con() #Motion print angles_to_hkl((0., 60., 0., 30., 0., 0.)) print hkl_to_angles(1, 0, 0) -sixc.write([0, 60, 0, 30, 90, 0]) +#sixc.write([0, 60, 0, 30, 90, 0]) print "sixc=" , sixc.position -wl.write(1.0) +#wl.write(1.0) print "wl = ", wl.read() ub.lastub() ub.setu ([[1, 0, 0], [0, 1, 0], [0, 0, 1]])