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

DRY

Browse Source
This commit is contained in:
augustin_s
2022-07-08 19:34:11 +02:00
parent 53424a9419
commit 46f816e261
4 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slic/devices/xoptics/slits/slits_old-SlitBlades.py
+3 -10
View File
@@ -1,7 +1,9 @@
from slic.devices.general.motor import Motor
from old_slit_base import SlitBase
class SlitBlades:
class SlitBlades(SlitBase):
def __init__(self, ID, name=None, elog=None, z_undulator=None, description=None):
self.ID = ID
@@ -47,14 +49,5 @@ class SlitBlades:
c2 = self._y2.set_target_value(value + vg / 2)
return c1, c2
def __call__(self, width, height):
self.set_hg(width)
self.set_vg(height)
def __repr__(self):
string1 = "gap: (%g,%g) mm" % (self.get_hg(), self.get_vg())
string2 = "pos: (%g,%g) mm" % (self.get_ho(), self.get_vo())
return "\n".join((string1, string2))
slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py
+5 -12
View File
@@ -1,7 +1,9 @@
from slic.devices.general.motor import Motor
from old_slit_base import SlitBase
class SlitBlades_JJ:
class SlitBlades_JJ(SlitBase):
def __init__(self, ID, name=None, elog=None):
self.ID = ID
@@ -37,8 +39,8 @@ class SlitBlades_JJ:
def set_ho(self, value):
hg = self.get_hg()
c1 = self._x1.set_target_value(-(-value - hg / 2))
c2 = self._x2.set_target_value(-(-value + hg / 2))
c1 = self._x1.set_target_value(value + hg / 2)
c2 = self._x2.set_target_value(value - hg / 2)
return c1, c2
def set_vo(self, value):
@@ -47,14 +49,5 @@ class SlitBlades_JJ:
c2 = self._y2.set_target_value(value - vg / 2)
return c1, c2
def __call__(self, width, height):
self.set_hg(width)
self.set_vg(height)
def __repr__(self):
string1 = "gap: (%g,%g) mm" % (self.get_hg(), self.get_vg())
string2 = "pos: (%g,%g) mm" % (self.get_ho(), self.get_vo())
return "\n".join((string1, string2))
slic/devices/xoptics/slits/slits_old-SlitFourBlades.py
+3 -10
View File
@@ -1,7 +1,9 @@
from slic.devices.general.motor import Motor
from old_slit_base import SlitBase
class SlitFourBlades:
class SlitFourBlades(SlitBase):
def __init__(self, ID, name=None, elog=None, z_undulator=None, description=None):
self.ID = ID
@@ -59,14 +61,5 @@ class SlitFourBlades:
c4 = self._by2.set_target_value(value + vg / 2)
return c1, c2, c3, c4
def __call__(self, width, height):
self.set_hg(width)
self.set_vg(height)
def __repr__(self):
string1 = "gap: (%g,%g) mm" % (self.get_hg(), self.get_vg())
string2 = "pos: (%g,%g) mm" % (self.get_ho(), self.get_vo())
return "\n".join((string1, string2))
slic/devices/xoptics/slits/slits_old-SlitPosWidth.py
+3 -10
View File
@@ -1,7 +1,9 @@
from slic.devices.general.motor import Motor
from old_slit_base import SlitBase
class SlitPosWidth:
class SlitPosWidth(SlitBase):
def __init__(self, ID, name=None, elog=None, z_undulator=None, description=None):
self.ID = ID
@@ -39,14 +41,5 @@ class SlitPosWidth:
c = self._yoffs.set_target_value(value)
return c
def __call__(self, width, height):
self.set_hg(width)
self.set_vg(height)
def __repr__(self):
string1 = "gap: (%g,%g) mm" % (self.get_hg(), self.get_vg())
string2 = "pos: (%g,%g) mm" % (self.get_ho(), self.get_vo())
return "\n".join((string1, string2))