diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py index c8489808..fba8c866 100644 --- a/script/MultiRegionScan.py +++ b/script/MultiRegionScan.py @@ -72,11 +72,15 @@ class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix): ny = Scienta.slices.read() return ny +global scan_index scan_index = -1 def do_scan(motors, positions, regions, latency): - sensors = [SampleCurrent, RefCurrent] + global scan_index + global SENSORS + scan_index += 1 + SENSORS = [SampleCurrent, RefCurrent] for (index, region) in enumerate(regions): reader = SpectrumReader() @@ -85,19 +89,19 @@ def do_scan(motors, positions, regions, latency): reader.region = region reader.initialize() set_device_alias(reader, "ScientaSpectrum{0}".format(index + 1)) - sensors.append(reader) + SENSORS.append(reader) image = ImageReader() image.region_index = index image.region = region image.initialize() set_device_alias(image, "ScientaImage{0}".format(index + 1)) - sensors.append(image) + SENSORS.append(image) 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, before_read=wait_beam, after_read = after_readout) try: