Script execution

This commit is contained in:
gac-x04sa
2018-10-31 11:36:57 +01:00
parent c9bd8c80f2
commit 8593116bad
+10 -6
View File
@@ -98,6 +98,8 @@ def set_geometry(value, apply = None):
set_setting(GEOMETRY_PREFERENCE, value )
run(filename)
def is_geometry_set():
return get_device("wavelength") is not None
###################################################################################################
# Scan callbacks
@@ -174,12 +176,14 @@ def get_diag_channels():
trx, \
thy, \
]
for name in "h", "k", "l", "wavelength":
dev = get_device(name)
if dev is not None:
diag_channels.append(dev)
if is_geometry_set():
diag_channels.append(h.readback)
diag_channels.append(k.readback)
diag_channels.append(l.readback)
set_device_alias(h.readback, "h")
set_device_alias(k.readback, "k")
set_device_alias(l.readback, "l")
diag_channels.append("wavelength")
return diag_channels
def get_diag_name(diag):