tligui_y/slic
0
0
Fork 0
forked from slic/slic
Code Pull Requests Actions Wiki Activity

merge SlitTwoBlades into SlitBlades

Browse Source
This commit is contained in:
augustin_s
2022-07-09 11:49:15 +02:00
parent 2478266839
commit a331b5ae67
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/devices/xoptics/slits/old/slitblades.py
+5 -5
View File
@@ -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()
slic/devices/xoptics/slits/old/slitfourblades.py
+2 -13
View File
@@ -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()