From 46f816e2611eb8deaff843ff39b14e39e2b684c4 Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 8 Jul 2022 19:34:11 +0200 Subject: [PATCH] DRY --- .../xoptics/slits/slits_old-SlitBlades.py | 13 +++---------- .../xoptics/slits/slits_old-SlitBlades_JJ.py | 17 +++++------------ .../xoptics/slits/slits_old-SlitFourBlades.py | 13 +++---------- .../xoptics/slits/slits_old-SlitPosWidth.py | 13 +++---------- 4 files changed, 14 insertions(+), 42 deletions(-) diff --git a/slic/devices/xoptics/slits/slits_old-SlitBlades.py b/slic/devices/xoptics/slits/slits_old-SlitBlades.py index e29e3106..8d6394a0 100644 --- a/slic/devices/xoptics/slits/slits_old-SlitBlades.py +++ b/slic/devices/xoptics/slits/slits_old-SlitBlades.py @@ -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)) - diff --git a/slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py b/slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py index 802b09c8..93eac6a9 100644 --- a/slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py +++ b/slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py @@ -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)) - diff --git a/slic/devices/xoptics/slits/slits_old-SlitFourBlades.py b/slic/devices/xoptics/slits/slits_old-SlitFourBlades.py index 01deeb38..380d263f 100644 --- a/slic/devices/xoptics/slits/slits_old-SlitFourBlades.py +++ b/slic/devices/xoptics/slits/slits_old-SlitFourBlades.py @@ -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)) - diff --git a/slic/devices/xoptics/slits/slits_old-SlitPosWidth.py b/slic/devices/xoptics/slits/slits_old-SlitPosWidth.py index 63d1fe88..8c8edb9c 100644 --- a/slic/devices/xoptics/slits/slits_old-SlitPosWidth.py +++ b/slic/devices/xoptics/slits/slits_old-SlitPosWidth.py @@ -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)) -