From 673a27b192f5806864b69efe5a9d4175fbcf2ad1 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 1 Feb 2022 17:54:47 +0100 Subject: [PATCH] Script execution --- script/test/20220201/MultiRegionScan.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/script/test/20220201/MultiRegionScan.py b/script/test/20220201/MultiRegionScan.py index 7edaa5e3..34fcf065 100644 --- a/script/test/20220201/MultiRegionScan.py +++ b/script/test/20220201/MultiRegionScan.py @@ -245,17 +245,15 @@ class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix): ny = Scienta.slices.read() return ny -class SimpleDeviceReader(ReadonlyRegisterBase): +class SimpleDeviceReader(Readable): """ pseudo-device class to read out another device once per region. - the device must be set assigned to the device attribute. + the device must be set assigned to the source attribute. """ def read(self): - print("simple device read") - v = self.source.read() - print(v) - return v + return self.source.read() + def setup_live_plots(regions): global live_plots @@ -320,8 +318,6 @@ def do_scan(scan, motors, positions, regions, latency): set_device_alias(dev, reader.region_name + "/RefCurrent") SENSORS.append(dev) - #SENSORS.append(SampleCurrent) - #SENSORS.append(RefCurrent) adjust_sensors() set_adc_averaging()