From 7c8882889a49ed573dcc0dd52e2bee67253b6209 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Fri, 25 Jan 2019 14:56:15 +0100 Subject: [PATCH] Closedown --- script/MultiRegion.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/script/MultiRegion.py b/script/MultiRegion.py index 6ae399f4..e9269979 100644 --- a/script/MultiRegion.py +++ b/script/MultiRegion.py @@ -39,7 +39,8 @@ close_shutter_at_end: close beam shutter and turn off analyser at the end of the import ch.psi.pshell.device.ReadonlyRegisterBase as ReadonlyRegisterBase import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterArray as ReadonlyRegisterArray import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterMatrix as ReadonlyRegisterMatrix -import startup + +from startup import * def check_region(region): """ @@ -201,14 +202,14 @@ def do_scan(motors, positions, regions, latency): reader.region_name = "region{0}".format(index + 1) reader.region = region reader.initialize() - startup.set_device_alias(reader, reader.region_name + "/ScientaSpectrum") + set_device_alias(reader, reader.region_name + "/ScientaSpectrum") SENSORS.append(reader) image = ImageReader() image.region_index = index image.region = region image.initialize() - startup.set_device_alias(image, reader.region_name + "/ScientaImage") + set_device_alias(image, reader.region_name + "/ScientaImage") SENSORS.append(image) SENSORS.append(SampleCurrent)