slic/sfop
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed unused import; formatting

Browse Source
This commit is contained in:
augustin_s
2022-09-17 10:01:24 +02:00
parent 8ee20f9278
commit 08ac0c408e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Ecol.py
View File

@ -1,10 +1,11 @@
from slic.core.adjustable import Adjustable, PVAdjustable from slic.core.adjustable import Adjustable
from slic.core.device import SimpleDevice from slic.core.device import SimpleDevice
from magnet import Magnet from magnet import Magnet
class EcolScaler(Adjustable): class EcolScaler(Adjustable):
def __init__(self, ID="ECOL-SCALER", factor=1): def __init__(self, ID="ECOL-SCALER", factor=1):
super().__init__(ID) super().__init__(ID)
self.factor = factor self.factor = factor
@ -33,8 +34,10 @@ class EcolScaler(Adjustable):
m10=mag10, m10=mag10,
m11=mag11 m11=mag11
) )
def get_current_value(self): def get_current_value(self):
return self.factor return self.factor
def set_target_value(self, factor): def set_target_value(self, factor):
old_factor = self.factor old_factor = self.factor
self.factor = factor self.factor = factor
@ -45,6 +48,7 @@ class EcolScaler(Adjustable):
t = m.set(current / old_factor * factor) t = m.set(current / old_factor * factor)
for t in tasks: for t in tasks:
t.wait() t.wait()
def is_moving(self): def is_moving(self):
return any(m.is_moving() for m in self.magnets) return any(m.is_moving() for m in self.magnets)

6
magnets.py
View File

@ -1,10 +1,11 @@
from slic.core.adjustable import Adjustable, PVAdjustable from slic.core.adjustable import Adjustable
from slic.core.device import SimpleDevice from slic.core.device import SimpleDevice
from magnet import Magnet from magnet import Magnet
class MagnetsScaler(Adjustable): class MagnetsScaler(Adjustable):
def __init__(self, ID="MAGNETS-SCALER", factor=1): def __init__(self, ID="MAGNETS-SCALER", factor=1):
super().__init__(ID) super().__init__(ID)
self.factor = factor self.factor = factor
@ -15,8 +16,10 @@ class MagnetsScaler(Adjustable):
m1=mag1, m1=mag1,
# m2=mag2 # m2=mag2
) )
def get_current_value(self): def get_current_value(self):
return self.factor return self.factor
def set_target_value(self, factor): def set_target_value(self, factor):
old_factor = self.factor old_factor = self.factor
self.factor = factor self.factor = factor
@ -28,6 +31,7 @@ class MagnetsScaler(Adjustable):
t = m.set(current / old_factor * factor) t = m.set(current / old_factor * factor)
for t in tasks: # ... then we need to wait for all tasks to finish for t in tasks: # ... then we need to wait for all tasks to finish
t.wait() t.wait()
def is_moving(self): def is_moving(self):
return any(m.is_moving() for m in self.magnets) return any(m.is_moving() for m in self.magnets)