Closedown
This commit is contained in:
@@ -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
|
||||
###################################################################################################
|
||||
|
||||
Reference in New Issue
Block a user