removed unused import; formatting
This commit is contained in:
6
Ecol.py
6
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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
Reference in New Issue
Block a user