From de0f9d83d0fd39ef8764191c3a7606cb89f380bd Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Mon, 12 Oct 2020 12:47:14 +0200 Subject: [PATCH] refactor --- slic/devices/general/delay_stage.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/slic/devices/general/delay_stage.py b/slic/devices/general/delay_stage.py index 2570e884..b54f2cf4 100755 --- a/slic/devices/general/delay_stage.py +++ b/slic/devices/general/delay_stage.py @@ -21,23 +21,24 @@ class DelayStage(BaseDevice): def __init__(self, name): self.name = name - self.motor = Motor(name) - self.delay = Delay(self.motor) + + self.motor = motor = Motor(name) + self.delay = delay = Delay(motor) + + self.devices = { + "motor": motor, + "delay": delay + } + def __repr__(self): - devices = (self.motor, self.delay) - return " | ".join(repr(d) for d in devices) + return " | ".join(repr(d) for d in self.devices.values()) def __str__(self): - devices = (self.motor, self.delay) - return " | ".join(str(d) for d in devices) + return " | ".join(str(d) for d in self.devices.values()) def get(self): - res = { - "motor": self.motor.get_current_value(), - "delay": self.delay.get_current_value() - } - return res + return {n: d.get_current_value() for n, d in self.devices.items()}