diff --git a/config/settings.properties b/config/settings.properties index f05b810..7cb210a 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,8 +1,8 @@ -#Thu Aug 22 10:45:21 CEST 2019 +#Thu Aug 22 10:45:35 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 -geometry=fourcv +geometry=fourcvi roi=173 88 285 136 user_exp=NNO user_name=pshell_development diff --git a/script/local.py b/script/local.py index 97256ed..a37e5e1 100644 --- a/script/local.py +++ b/script/local.py @@ -15,6 +15,7 @@ import json INTERLOCKS = [] def clear_interlocks(): + global INTERLOCKS for interlock in INTERLOCKS: try: interlock.close() @@ -23,6 +24,7 @@ def clear_interlocks(): INTERLOCKS = [] def add_interlock(interlock): + global INTERLOCKS INTERLOCKS.append(interlock)