From 62885d3281cfc3166d824bb996916e290cd2ca7d Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-2.psi.ch>
Date: Fri, 12 Oct 2018 11:09:42 +0200
Subject: [PATCH] Closedown

---
 config/devices.properties        | 14 +++++++-------
 script/test/TestFourcvCompact.py | 11 +++++++----
 script/test/TestLScan.py         |  2 ++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/config/devices.properties b/config/devices.properties
index 9da4ee9..87119e7 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,10 +1,10 @@
-$omegaV=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAV|||true
-$alpha=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:ALPHA|||true
-$delta=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:DELTA|||true
-$gamma=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:GAMMA|||true
-$nu=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:NU|||true
-$phi=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:PHI|||true
-$omegaH=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAH|||true
+omegaV=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAV|||true
+alpha=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:ALPHA|||true
+delta=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:DELTA|||true
+gamma=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:GAMMA|||true
+nu=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:NU|||true
+phi=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:PHI|||true
+omegaH=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAH|||true
 current=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT|Read||true
 xv=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:XV|||true
 y1=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:Y1|||true
diff --git a/script/test/TestFourcvCompact.py b/script/test/TestFourcvCompact.py
index b18ae03..aff8756 100644
--- a/script/test/TestFourcvCompact.py
+++ b/script/test/TestFourcvCompact.py
@@ -67,9 +67,12 @@ ub.checkub()
 #Constraints
 ###################################################################################################
 help(hkl.con)
-#hkl.con('a_eq_b')
+hkl.con('a_eq_b')
 #hkl.con('eta:0')
-hkl.con( 'eta', 0)
+
+
+#hkl.con( 'eta', 0)    #OmegaV constant
+#hkl.con( 'mu', 20)    #Alpha constant
 
 
 ###################################################################################################\
@@ -77,6 +80,6 @@ hkl.con( 'eta', 0)
 ###################################################################################################
 
 #print  angles_to_hkl((16.278,    0.0000,   32.5568, 0.0))
-print  angles_to_hkl((44.3400,    0.0000,  123.7322 , 0.0))
-print hkl_to_angles(2, -2, 10)
+#print  angles_to_hkl((44.3400,    0.0000,  123.7322 , 0.0))
+#print hkl_to_angles(2, -2, 10)
 
diff --git a/script/test/TestLScan.py b/script/test/TestLScan.py
index 8e3a3be..b8277ca 100644
--- a/script/test/TestLScan.py
+++ b/script/test/TestLScan.py
@@ -4,5 +4,7 @@ l.move(0.9)
 l.write(1.1)
 l.waitReady(-1)
 
+print hkl_group.isReady()
+
 #l.write(0.9)
 #l.waitReady(-1)