diff --git a/config/settings.properties b/config/settings.properties index 7feb53f..85843f1 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,2 +1,2 @@ -#Mon Feb 11 08:51:33 CET 2019 +#Mon Feb 11 09:06:03 CET 2019 geometry=fourcv diff --git a/script/daq/daq3-setup.py b/script/daq/daq3-setup.py index bf9ce30..4c12593 100644 --- a/script/daq/daq3-setup.py +++ b/script/daq/daq3-setup.py @@ -8,6 +8,10 @@ set_geometry("fourcv", True) ################################################################################################### hkl.con('a_eq_b') +#equivalent to 'setmode 0' + 'freeze 5' +#hkl.con( 'mu', 5) #alpha constant +#hkl.con( 'eta', 0) #alpha constant + ###################################################################################################\ #Orientation @@ -30,10 +34,20 @@ ub.setlat('cubic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0) en = 9.5 #en = 12.4 #!!!!! + + +ub.setmiscut(0) + ub.ub() ub.checkub() calc_ub = get_ub_matrix() + +#print angles_to_hkl((44.3400, 0.0000, 123.7322 , 0.0))[0] +hkl_to_angles(0, 1, 2)[0] + + + """ #"mu", "delta", "gam", "eta" #ub.addref([0, 1, 2], [9.7280, 9.7490, 19.5860, 93.1159], en)