From 126deea42843ed706c8de0d9425156c5f33ab993 Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-2.psi.ch>
Date: Thu, 22 Aug 2019 11:30:46 +0200
Subject: [PATCH]

---
 config/diffcalc/.nfs0000000016351ae600000352 | 0
 config/settings.properties                   | 2 +-
 script/geometry/fourcvi.py                   | 2 +-
 script/local.py                              | 2 ++
 4 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 config/diffcalc/.nfs0000000016351ae600000352

diff --git a/config/diffcalc/.nfs0000000016351ae600000352 b/config/diffcalc/.nfs0000000016351ae600000352
deleted file mode 100644
index e69de29..0000000
diff --git a/config/settings.properties b/config/settings.properties
index 75b3e76..2fa7815 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,4 +1,4 @@
-#Thu Aug 22 10:46:15 CEST 2019
+#Thu Aug 22 11:00:03 CEST 2019
 count_time=1
 data_root=/sls/X04SA/data/x04sa/ES3/expdata
 detectors=mythen,mythen.acquire_time,pixel,pixel.image_filename,image.intensity,image.corrected_intensity,image.matrix
diff --git a/script/geometry/fourcvi.py b/script/geometry/fourcvi.py
index 6231f94..f22043c 100644
--- a/script/geometry/fourcvi.py
+++ b/script/geometry/fourcvi.py
@@ -16,7 +16,7 @@ class InterlockFourcv (Interlock):
         if fourcv.isStartingSimultaneousMove():
             a, d, g, o = p
             
-        if g < (a-10):
+        if g < (a-3):
             return False
             
         return True
diff --git a/script/local.py b/script/local.py
index a37e5e1..b3df35c 100644
--- a/script/local.py
+++ b/script/local.py
@@ -507,6 +507,8 @@ def backup_ub(name=None, destination = "{data}"):
     """
     if not name:
         name = ub.ubcalc._state.name
+    if not name:
+        raise Exception("No UB matrix defined")
     name = name + ".json"
     f = settings.persistence_path + "/" + name 
     if not os.path.isfile(f):