From 08ac0c408e1101438bcfc4d0d0b6751e109f9ea2 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Sat, 17 Sep 2022 10:01:24 +0200 Subject: [PATCH] removed unused import; formatting --- Ecol.py | 6 +++++- magnets.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Ecol.py b/Ecol.py index de96331..4af7e86 100644 --- a/Ecol.py +++ b/Ecol.py @@ -1,10 +1,11 @@ -from slic.core.adjustable import Adjustable, PVAdjustable +from slic.core.adjustable import Adjustable from slic.core.device import SimpleDevice from magnet import Magnet class EcolScaler(Adjustable): + def __init__(self, ID="ECOL-SCALER", factor=1): super().__init__(ID) self.factor = factor @@ -33,8 +34,10 @@ class EcolScaler(Adjustable): m10=mag10, m11=mag11 ) + def get_current_value(self): return self.factor + def set_target_value(self, factor): old_factor = self.factor self.factor = factor @@ -45,6 +48,7 @@ class EcolScaler(Adjustable): t = m.set(current / old_factor * factor) for t in tasks: t.wait() + def is_moving(self): return any(m.is_moving() for m in self.magnets) diff --git a/magnets.py b/magnets.py index 2c352de..7d65dd4 100644 --- a/magnets.py +++ b/magnets.py @@ -1,10 +1,11 @@ -from slic.core.adjustable import Adjustable, PVAdjustable +from slic.core.adjustable import Adjustable from slic.core.device import SimpleDevice from magnet import Magnet class MagnetsScaler(Adjustable): + def __init__(self, ID="MAGNETS-SCALER", factor=1): super().__init__(ID) self.factor = factor @@ -15,8 +16,10 @@ class MagnetsScaler(Adjustable): m1=mag1, # m2=mag2 ) + def get_current_value(self): return self.factor + def set_target_value(self, factor): old_factor = self.factor self.factor = factor @@ -28,6 +31,7 @@ class MagnetsScaler(Adjustable): t = m.set(current / old_factor * factor) for t in tasks: # ... then we need to wait for all tasks to finish t.wait() + def is_moving(self): return any(m.is_moving() for m in self.magnets)