diff --git a/slic/devices/xoptics/slits/old/slitblades.py b/slic/devices/xoptics/slits/old/slitblades.py index 431d0a2e..27b7c6bf 100644 --- a/slic/devices/xoptics/slits/old/slitblades.py +++ b/slic/devices/xoptics/slits/old/slitblades.py @@ -5,12 +5,12 @@ from slitbase import SlitBase class SlitBlades(SlitBase): - def __init__(self, ID): + def __init__(self, ID, motor_name="MOTOR_"): self.ID = ID - self.x1 = Motor(ID + ":MOTOR_X1") - self.x2 = Motor(ID + ":MOTOR_X2") - self.y1 = Motor(ID + ":MOTOR_Y1") - self.y2 = Motor(ID + ":MOTOR_Y2") + self.x1 = Motor(ID + ":" + motor_name + "X1") + self.x2 = Motor(ID + ":" + motor_name + "X2") + self.y1 = Motor(ID + ":" + motor_name + "Y1") + self.y2 = Motor(ID + ":" + motor_name + "Y2") def get_hg(self): return self.x2.get_current_value() - self.x1.get_current_value() diff --git a/slic/devices/xoptics/slits/old/slitfourblades.py b/slic/devices/xoptics/slits/old/slitfourblades.py index 6a5cdb48..2b1decaa 100644 --- a/slic/devices/xoptics/slits/old/slitfourblades.py +++ b/slic/devices/xoptics/slits/old/slitfourblades.py @@ -4,23 +4,12 @@ from slitbase import SlitBase from slitblades import SlitBlades -class SlitTwoBlades(SlitBlades): - - def __init__(self, ID, motor_name): - self.ID = ID - self.x1 = Motor(ID + ":" + motor_name + "X1") - self.x2 = Motor(ID + ":" + motor_name + "X2") - self.y1 = Motor(ID + ":" + motor_name + "Y1") - self.y2 = Motor(ID + ":" + motor_name + "Y2") - - - class SlitFourBlades(SlitBase): def __init__(self, ID): self.ID = ID - self.a = SlitTwoBlades(ID, "MOTOR_A") - self.b = SlitTwoBlades(ID, "MOTOR_B") + self.a = SlitBlades(ID, "MOTOR_A") + self.b = SlitBlades(ID, "MOTOR_B") def get_hg(self): return self.a.get_hg()