From d987da9680cde7bd119cbee7d53f9db0f35f11a4 Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-2.psi.ch>
Date: Wed, 31 Jul 2019 10:23:03 +0200
Subject: [PATCH] Closedown

---
 config/devices.properties  |  1 +
 config/diffcalc/test1.json | 12 ++++++------
 config/settings.properties |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/devices.properties b/config/devices.properties
index 961161c..47338e3 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -40,6 +40,7 @@ oa=ch.psi.pshell.epics.Motor|X04SA-ES3-XPS:OMEGAA|||true
 #idgap=ch.psi.pshell.epics.Motor|X04SA-|||true
 #sixch=ch.psi.pshell.device.MotorGroupBase|alpha delta gamma omegaH nu phi|||
 fourcv=ch.psi.pshell.device.MotorGroupBase|alpha delta gamma omegaV|||
+hexapod=ch.psi.pshell.device.MotorGroupBase|hx hy hz hrox hroy hroz|||
 $energy=ch.psi.pshell.epics.Positioner|X04SA-DCM:E X04SA-DCM:E-READ|||true
 transm=ch.psi.pshell.epics.ControlledVariable|X04SA-ES2-FI:TRANSM-SET X04SA-ES2-FI:TRANSM|||true
 shutter=ch.psi.pshell.epics.ChannelString|X04SA-ES3-SC:LEVEL|||true
diff --git a/config/diffcalc/test1.json b/config/diffcalc/test1.json
index 454bdd3..400afe0 100644
--- a/config/diffcalc/test1.json
+++ b/config/diffcalc/test1.json
@@ -3,25 +3,25 @@
     "crystal": "['cubic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0]", 
     "reflist": {
         "1": {
-            "tag": "None", 
+            "tag": null, 
             "hkl": "[0.0, 1.0, 2.0]", 
             "pos": "[5.0, 9.379, 19.7895, 102.6162, 0, 0]", 
             "energy": 9.5007, 
-            "time": "2019-07-30T16:52:49.907000"
+            "time": "2019-07-31T10:03:23.048000"
         }, 
         "2": {
-            "tag": "None", 
+            "tag": null, 
             "hkl": "[2.0, 0.0, 2.0]", 
             "pos": "[5.0, 19.0754, 20.1865, 11.9693, 0, 0]", 
             "energy": 9.5007, 
-            "time": "2019-07-30T16:52:49.941000"
+            "time": "2019-07-31T10:03:23.082000"
         }, 
         "3": {
-            "tag": "None", 
+            "tag": null, 
             "hkl": "[2.0, 2.0, 2.0]", 
             "pos": "[5.0, 27.1234, 21.2368, 60.0354, 0, 0]", 
             "energy": 9.5007, 
-            "time": "2019-07-30T16:52:50.020000"
+            "time": "2019-07-31T10:03:23.189000"
         }
     }, 
     "orientlist": {}, 
diff --git a/config/settings.properties b/config/settings.properties
index d1313b7..29a6b71 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,4 +1,4 @@
-#Wed Jul 31 10:03:01 CEST 2019
+#Wed Jul 31 10:03:22 CEST 2019
 count_time=1.0
 geometry=fourcv
 roi=173 88 285 136