removed duplicate EcolEnergy
This commit is contained in:
@@ -199,37 +199,6 @@ class Double_Crystal_Mono(BaseDevice):
|
||||
self._currentChange = self.set_target_value(value)
|
||||
|
||||
|
||||
class EcolEnergy:
|
||||
|
||||
def __init__(self, Id, val="SARCL02-MBND100:P-SET", rb="SARCL02-MBND100:P-READ", dmov="SFB_BEAM_ENERGY_ECOL:SUM-ERROR-OK"):
|
||||
self.Id = Id
|
||||
self.setter = PV(val)
|
||||
self.readback = PV(rb)
|
||||
self.dmov = PV(dmov)
|
||||
self.done = False
|
||||
|
||||
def get_current_value(self):
|
||||
return self.readback.get()
|
||||
|
||||
def move_and_wait(self, value, checktime=0.01, precision=2):
|
||||
curr = self.setter.get()
|
||||
while abs(curr - value) > 0.1:
|
||||
curr = self.setter.get()
|
||||
self.setter.put(curr + np.sign(value - curr) * 0.1)
|
||||
sleep(0.3)
|
||||
|
||||
self.setter.put(value)
|
||||
while abs(self.get_current_value() - value) > precision:
|
||||
sleep(checktime)
|
||||
while not self.dmov.get():
|
||||
# print(self.dmov.get())
|
||||
sleep(checktime)
|
||||
|
||||
def set_target_value(self, value, hold=False):
|
||||
changer = lambda: self.move_and_wait(value)
|
||||
return Task(changer, hold=hold)
|
||||
|
||||
|
||||
class MonoEcolEnergy:
|
||||
|
||||
def __init__(self, Id):
|
||||
|
||||
Reference in New Issue
Block a user