diff --git a/slic/devices/xoptics/slits/slits_new-SlitBlades.py b/slic/devices/xoptics/slits/slits_new-SlitBlades.py index b7e6ce21..f0e48bea 100644 --- a/slic/devices/xoptics/slits/slits_new-SlitBlades.py +++ b/slic/devices/xoptics/slits/slits_new-SlitBlades.py @@ -1,6 +1,5 @@ from slic.devices.general.motor import Motor from ..general.adjustable import AdjustableVirtual -from slic.utils.deprecated.aliases import Alias, append_object_to_object class SlitBlades: @@ -8,15 +7,14 @@ class SlitBlades: def __init__(self, pvname, name=None, elog=None): self.name = name self.ID = pvname - self.alias = Alias(name) - append_object_to_object(self, Motor, pvname + ":MOTOR_X1", name="right") - append_object_to_object(self, Motor, pvname + ":MOTOR_X2", name="left") - append_object_to_object(self, Motor, pvname + ":MOTOR_Y1", name="down") - append_object_to_object(self, Motor, pvname + ":MOTOR_Y2", name="up") - append_object_to_object(self, Motor, pvname + ":MOTOR_X", name="hpos_virt_mrec") - append_object_to_object(self, Motor, pvname + ":MOTOR_W", name="hgap_virt_mrec") - append_object_to_object(self, Motor, pvname + ":MOTOR_Y", name="vpos_virt_mrec") - append_object_to_object(self, Motor, pvname + ":MOTOR_H", name="vgap_virt_mrec") + self.right = Motor(pvname + ":MOTOR_X1") + self.left = Motor(pvname + ":MOTOR_X2") + self.down = Motor(pvname + ":MOTOR_Y1") + self.up = Motor(pvname + ":MOTOR_Y2") + self.hpos_virt_mrec = Motor(pvname + ":MOTOR_X") + self.hgap_virt_mrec = Motor(pvname + ":MOTOR_W") + self.vpos_virt_mrec = Motor(pvname + ":MOTOR_Y") + self.vgap_virt_mrec = Motor(pvname + ":MOTOR_H") def getgap(xn, xp): return xp - xn @@ -36,18 +34,10 @@ class SlitBlades: def setvpos(x): return tuple([tx + self.vgap.get_current_value() for tx in [-x / 2, x / 2]]) - append_object_to_object( - self, AdjustableVirtual, [self.right, self.left], getgap, setwidth, reset_current_value_to=True, name="hgap", - ) - append_object_to_object( - self, AdjustableVirtual, [self.down, self.up], getgap, setheight, reset_current_value_to=True, name="vgap", - ) - append_object_to_object( - self, AdjustableVirtual, [self.right, self.left], getpos, sethpos, reset_current_value_to=True, name="hpos", - ) - append_object_to_object( - self, AdjustableVirtual, [self.down, self.up], getpos, setvpos, reset_current_value_to=True, name="vpos", - ) + self.hgap = AdjustableVirtual([self.right, self.left], getgap, setwidth, reset_current_value_to=True) + self.vgap = AdjustableVirtual([self.down, self.up], getgap, setheight, reset_current_value_to=True) + self.hpos = AdjustableVirtual([self.right, self.left], getpos, sethpos, reset_current_value_to=True) + self.vpos = AdjustableVirtual([self.down, self.up], getpos, setvpos, reset_current_value_to=True) def __call__(self, *args): if len(args) == 0: diff --git a/slic/devices/xoptics/slits/slits_new-SlitBlades_JJ.py b/slic/devices/xoptics/slits/slits_new-SlitBlades_JJ.py index ed07ffca..86b828e4 100644 --- a/slic/devices/xoptics/slits/slits_new-SlitBlades_JJ.py +++ b/slic/devices/xoptics/slits/slits_new-SlitBlades_JJ.py @@ -1,6 +1,5 @@ from slic.devices.general.motor import Motor from ..general.adjustable import AdjustableVirtual -from slic.utils.deprecated.aliases import Alias, append_object_to_object class SlitBlades_JJ: @@ -8,11 +7,10 @@ class SlitBlades_JJ: def __init__(self, pvname, name=None, elog=None): self.name = name self.ID = pvname - self.alias = Alias(name) - append_object_to_object(self, Motor, pvname + ":MOT_1", name="right") - append_object_to_object(self, Motor, pvname + ":MOT_2", name="left") - append_object_to_object(self, Motor, pvname + ":MOT_4", name="down") - append_object_to_object(self, Motor, pvname + ":MOT_3", name="up") + self.right = Motor(pvname + ":MOT_1") + self.left = Motor(pvname + ":MOT_2") + self.down = Motor(pvname + ":MOT_4") + self.up = Motor(pvname + ":MOT_3") def getgap(xn, xp): return xp - xn @@ -32,18 +30,10 @@ class SlitBlades_JJ: def setvpos(x): return tuple([tx + self.vgap.get_current_value() for tx in [-x / 2, x / 2]]) - append_object_to_object( - self, AdjustableVirtual, [self.right, self.left], getgap, setwidth, reset_current_value_to=True, name="hgap", - ) - append_object_to_object( - self, AdjustableVirtual, [self.down, self.up], getgap, setheight, reset_current_value_to=True, name="vgap", - ) - append_object_to_object( - self, AdjustableVirtual, [self.right, self.left], getpos, sethpos, reset_current_value_to=True, name="hpos", - ) - append_object_to_object( - self, AdjustableVirtual, [self.down, self.up], getpos, setvpos, reset_current_value_to=True, name="vpos", - ) + self.hgap = AdjustableVirtual([self.right, self.left], getgap, setwidth, reset_current_value_to=True) + self.vgap = AdjustableVirtual([self.down, self.up], getgap, setheight, reset_current_value_to=True) + self.hpos = AdjustableVirtual([self.right, self.left], getpos, sethpos, reset_current_value_to=True) + self.vpos = AdjustableVirtual([self.down, self.up], getpos, setvpos, reset_current_value_to=True) def __call__(self, *args): if len(args) == 0: diff --git a/slic/devices/xoptics/slits/slits_new-SlitPosWidth.py b/slic/devices/xoptics/slits/slits_new-SlitPosWidth.py index 24ca9c0d..bcd3a786 100644 --- a/slic/devices/xoptics/slits/slits_new-SlitPosWidth.py +++ b/slic/devices/xoptics/slits/slits_new-SlitPosWidth.py @@ -1,6 +1,5 @@ from slic.devices.general.motor import Motor from ..general.adjustable import AdjustableVirtual -from slic.utils.deprecated.aliases import Alias, append_object_to_object from functools import partial @@ -9,11 +8,10 @@ class SlitPosWidth: def __init__(self, pvname, name=None, elog=None): self.name = name self.ID = pvname - self.alias = Alias(name) - append_object_to_object(self, Motor, pvname + ":MOTOR_X", name="hpos") - append_object_to_object(self, Motor, pvname + ":MOTOR_Y", name="vpos") - append_object_to_object(self, Motor, pvname + ":MOTOR_W", name="hgap") - append_object_to_object(self, Motor, pvname + ":MOTOR_H", name="vgap") + self.hpos = Motor(pvname + ":MOTOR_X") + self.vpos = Motor(pvname + ":MOTOR_Y") + self.hgap = Motor(pvname + ":MOTOR_W") + self.vgap = Motor(pvname + ":MOTOR_H") def getblade(pos, gap, direction=1): return pos + direction * gap / 2 @@ -39,10 +37,10 @@ class SlitPosWidth: def setvpos(x): return tuple([tx + self.vgap.get_current_value() for tw in [-x / 2, x / 2]]) - append_object_to_object(self, AdjustableVirtual, [self.vpos, self.vgap], partial(getblade, direction=1), partial(setblade, direction=1), reset_current_value_to=True, name="up") - append_object_to_object(self, AdjustableVirtual, [self.vpos, self.vgap], partial(getblade, direction=-1), partial(setblade, direction=-1), reset_current_value_to=True, name="down") - append_object_to_object(self, AdjustableVirtual, [self.hpos, self.hgap], partial(getblade, direction=1), partial(setblade, direction=1), reset_current_value_to=True, name="left") - append_object_to_object(self, AdjustableVirtual, [self.hpos, self.hgap], partial(getblade, direction=-1), partial(setblade, direction=-1), reset_current_value_to=True, name="right") + self.up = AdjustableVirtual([self.vpos, self.vgap], partial(getblade, direction=1), partial(setblade, direction=1), reset_current_value_to=True) + self.down = AdjustableVirtual([self.vpos, self.vgap], partial(getblade, direction=-1), partial(setblade, direction=-1), reset_current_value_to=True) + self.left = AdjustableVirtual([self.hpos, self.hgap], partial(getblade, direction=1), partial(setblade, direction=1), reset_current_value_to=True) + self.right = AdjustableVirtual([self.hpos, self.hgap], partial(getblade, direction=-1), partial(setblade, direction=-1), reset_current_value_to=True) def __call__(self, *args): if len(args) == 0: