From 0b0824bc872e2d3e735c6673c1b547be5480576e Mon Sep 17 00:00:00 2001 From: Alexandre Gobbo Date: Wed, 15 Jul 2020 15:57:57 +0200 Subject: [PATCH] Startup --- config/settings.properties | 8 ++++---- script/diffcalc_test/testfivec.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/settings.properties b/config/settings.properties index c3bb8c6..0eb3e6b 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,5 +1,5 @@ -#Wed Jul 15 15:54:42 CEST 2020 -test=1 -geometry=fourcv -ScanIndex=5 +#Wed Jul 15 15:57:34 CEST 2020 FdaBrowser=true +ScanIndex=5 +geometry=fourcv +test=1 diff --git a/script/diffcalc_test/testfivec.py b/script/diffcalc_test/testfivec.py index a9445f7..c2e7cd3 100644 --- a/script/diffcalc_test/testfivec.py +++ b/script/diffcalc_test/testfivec.py @@ -52,8 +52,8 @@ hkl.con() ###################################################################################################\ #Motion ################################################################################################### -print angles_to_hkl((60., 0., 30., 0., 0.)) -print hkl_to_angles(1, 0, 0) +print hklci((60., 0., 30., 0., 0.)) +print hklca(1, 0, 0) fivec.write([60, 0, 30, 90, 0]) print "fivec=" , fivec.position wavelength.write(1.0)