From d10d39610e639a960cc66eacd82833b1a1250191 Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 6 Jun 2017 11:05:18 +0200 Subject: [PATCH] Script execution --- script/MultiRegionScan.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index fdb8dfc5..056af1bb 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -132,14 +132,14 @@ def do_scan(motors, positions, regions, latency): reader.region_index = index reader.region = region reader.initialize() - set_device_alias(reader, "ScientaSpectrum{0}".format(index + 1)) + set_device_alias(reader, "region {0}/ScientaSpectrum".format(index + 1)) SENSORS.append(reader) image = ImageReader() image.region_index = index image.region = region image.initialize() - set_device_alias(image, "ScientaImage{0}".format(index + 1)) + set_device_alias(image, "region {0}/ScientaImage".format(index + 1)) SENSORS.append(image) SENSORS.append(SampleCurrent) @@ -147,13 +147,13 @@ def do_scan(motors, positions, regions, latency): adjust_sensors() set_adc_averaging() - vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout) - #vscan(motors, SENSORS, positions, True, latency,False, after_read = after_readout) + #vscan(motors, SENSORS, positions, True, latency,False, before_read=wait_beam, after_read = after_readout) + vscan(motors, SENSORS, positions, True, latency,False, after_read = after_readout) - for (index, region) in enumerate(regions): - set_attribute(get_exec_pars().scanPath + "ScientaSpectrum{0}".format(index + 1), "RegionName", region['name']) - set_attribute(get_exec_pars().scanPath + "ScientaImage{0}".format(index + 1), "RegionName", region['name']) - set_attribute(get_exec_pars().scanPath, "Regions", [region['name'] for region in regions]) + #for (index, region) in enumerate(regions): + # set_attribute(get_exec_pars().scanPath + "ScientaSpectrum{0}".format(index + 1), "RegionName", region['name']) + # set_attribute(get_exec_pars().scanPath + "ScientaImage{0}".format(index + 1), "RegionName", region['name']) + #set_attribute(get_exec_pars().scanPath, "Regions", [region['name'] for region in regions]) try: setup_live_plots(REGIONS)