From eb38a0d8a801c5ee40d95e0fbf7046d50e6cf6cb Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-2.psi.ch>
Date: Wed, 21 Aug 2019 14:42:26 +0200
Subject: [PATCH] Closedown

---
 config/diffcalc/.nfs0000000016351a4f0000022e |  0
 config/settings.properties                   |  2 +-
 script/local.py                              | 47 ++++++++++++++++++--
 3 files changed, 44 insertions(+), 5 deletions(-)
 delete mode 100644 config/diffcalc/.nfs0000000016351a4f0000022e

diff --git a/config/diffcalc/.nfs0000000016351a4f0000022e b/config/diffcalc/.nfs0000000016351a4f0000022e
deleted file mode 100644
index e69de29..0000000
diff --git a/config/settings.properties b/config/settings.properties
index de19028..aa8a345 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,4 +1,4 @@
-#Wed Aug 21 10:38:15 CEST 2019
+#Wed Aug 21 12:24:39 CEST 2019
 count_time=1.0
 data_root=/sls/X04SA/data/x04sa/ES3/expdata
 geometry=fourcv
diff --git a/script/local.py b/script/local.py
index d325df6..77bfc13 100644
--- a/script/local.py
+++ b/script/local.py
@@ -95,6 +95,8 @@ BG_ROI_PREFERENCE = "bg_roi"
 USER_NAME_PREFERENCE = "user_name"
 USER_EXP_PREFERENCE = "user_exp"
 DATA_ROOT_PREFERENCE = "data_root"
+DATA_ROOT_PREFERENCE = "data_root"
+DETECTORS_PREFERENCE = "detectors"
 
 def get_count_time():
     """
@@ -207,7 +209,47 @@ def load_user_env():
     (user, exp, path) = get_user_env()
     if user and path and exp:
         set_user_env(user, exp, path)
-    
+
+SUB_DEVICE_DETECTORS = {mythen.acquire_time : "mythen.acquire_time", 
+                        pixel.image_filename: "pixel.image_filename",
+                        image.intensity : "image.intensity",
+                        image.corrected_intensity : "image.corrected_intensity", 
+                        image.matrix : "image.matrix"}
+
+def get_detectors():
+    det_str = get_setting(DETECTORS_PREFERENCE)
+    if not det_str or not (det_str.strip()):
+        return []
+    devs = det_str.split(",")
+    ret = []
+    for name in devs:
+        name = name.strip()
+        dev = get_context().devicePool.getByName(name)
+        if not dev:
+            try:
+                dev = eval(name)
+                assert issubclass(dev.__class__,Device)
+            except:
+                dev = None
+    if dev: ret.append(dev)        
+    return ret
+
+
+def set_detectors(detectors):
+    devs = []
+    if detectors:
+        for d in detectors:
+            if is_string(d):
+                name = d
+            elif d in SUB_DEVICE_DETECTORS.keys(): 
+                name = SUB_DEVICE_DETECTORS[d]
+            else:
+                name = d.name
+            devs.append(name)
+            
+    set_setting(DETECTORS_PREFERENCE, ",".join(devs))
+    #set_detectors([mythen, mythen.acquire_time, pixel, pixel.image_filename, image.intensity,image.corrected_intensity, image.matrix])
+        
 
 ###################################################################################################
 #  Scan callbacks
@@ -548,9 +590,6 @@ def ct(count_time):
     tscan(get_detectors(), 1, 1.0 , before_read=before_sample, after_read=after_sample, name="ct")
 
 
-def get_detectors():
-    return [mythen, mythen.acquire_time, pixel, pixel.image_filename, image.intensity,image.corrected_intensity, image.matrix]   
-    
 ###################################################################################################
 #  Configuration 
 ###################################################################################################