From f8f6b139ca44c35225ca686f9e02a957725a9fb4 Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-2.psi.ch>
Date: Fri, 25 Jan 2019 15:29:42 +0100
Subject: [PATCH] Closedown

---
 config/settings.properties |  4 +--
 script/daq/daq2-setup.py   | 55 ++++++++++----------------------------
 2 files changed, 16 insertions(+), 43 deletions(-)

diff --git a/config/settings.properties b/config/settings.properties
index 348aca5..3f38faf 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,2 +1,2 @@
-#Fri Jan 25 14:35:20 CET 2019
-geometry=
+#Fri Jan 25 14:46:26 CET 2019
+geometry=fourcv
diff --git a/script/daq/daq2-setup.py b/script/daq/daq2-setup.py
index 3cab94c..bf9ce30 100644
--- a/script/daq/daq2-setup.py
+++ b/script/daq/daq2-setup.py
@@ -14,49 +14,15 @@ hkl.con('a_eq_b')
 ###################################################################################################
 
 """
-  #         H        K        L         ov       alp       del       gam        nu    dev'n
-  -         -        -        -        ---       ---       ---       ---       ---    -----
-  1    0.0000   1.0000   2.0000    93.1159    9.7280    9.7490   19.5860    0.0000
-       0.0000   1.0000   2.0000    93.1295    9.7212    9.7488   19.5860    0.0000   0.0000
-------------------------------------------------
-  2    2.0000   2.0000   2.0000    57.7252    9.6050   27.7006   20.9322    0.0000
-       2.0000   2.0000   2.0000    57.5840    9.8097   27.7194   20.9065    0.0000   0.0000
-------------------------------------------------
-  3    2.0000   0.0000   2.0000     8.6687    9.6023   19.4996   20.2618    0.0000
-       2.0000   0.0000   2.0000     8.4510    9.8217   19.5132   20.2488    0.0000   0.0000
-------------------------------------------------
-
-Orientation Matrix by Row:
-
-Row 1:    0.81374    0.02138    0.00228
-Row 2:   -0.02199    0.81543    0.00123
-Row 3:    0.00784   -0.00100    0.81347
-
-1874.X04V> wh
-
-H K L =  2  0  2
-BetaIn = 9.8218  BetaOut = 9.8218
-Lambda = 1.305
-
-   omegaV     alpha     delta     gamma        nu 
-   8.6687    9.6022   19.4996   20.2617    0.0000 
-
+Enter real space lattice parameters:
+ Lattice a (1.305)? 7.723
+ Lattice b (1.305)? 7.707
+ Lattice c (1.305)? 7.723
+ Lattice alpha (90)? 90
+ Lattice beta (90)? 89.265
+ Lattice gamma (90)? 90
 """
 
-ub.newub('test')
-
-ub.setub([[ 0.81374,    0.02138,    0.00228], [-0.02199,    0.81543,    0.00123], [ 0.00784,   -0.00100,    0.81347]])
-ub.checkub()
-
-print hkl_to_angles(0, 1, 2)[0]
-print hkl_to_angles(2, 2, 2)[0]
-print hkl_to_angles(2, 0, 2)[0]
-
-orig_ub = get_ub_matrix()
-
-
-
-
 
 ub.newub('test1')
 
@@ -64,6 +30,11 @@ ub.setlat('cubic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0)
 en = 9.5 
 #en = 12.4 #!!!!!
 
+ub.ub()
+ub.checkub()
+calc_ub =  get_ub_matrix()
+
+"""
 #"mu", "delta", "gam", "eta"
 #ub.addref([0, 1, 2], [9.7280, 9.7490, 19.5860, 93.1159], en)
 #ub.addref([2, 2, 2], [9.6050, 27.7006, 20.9322 , 57.7252], en)
@@ -92,3 +63,5 @@ for i in range(3):
         e[i][j] = abs(orig_ub[i][j] - calc_ub[i][j])
 
 for r in e: print r     
+
+"""
\ No newline at end of file