From 7bf1bed935adbec7a22cd65689e7cb6d60909d3f Mon Sep 17 00:00:00 2001 From: Da Vince Date: Thu, 30 Nov 2017 18:59:39 +0100 Subject: [PATCH 1/3] Description for KB added --- xoptics/KB.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xoptics/KB.py b/xoptics/KB.py index 6ac61a5..abf5154 100755 --- a/xoptics/KB.py +++ b/xoptics/KB.py @@ -19,4 +19,9 @@ class KB: return "KB is %s"%self.mode.lower() def __repr__(self): - return self.__str__() + s = "**KB mirror**\n\n" + + motors = "bend1 bend2 pitch roll yaw x y".split() + for motor in motors: + s+= " - %s = %.4f\n" %(motor, getattr(self,motor).wm()) + return s From 53c42b3a916af8bf29768fb2f4502304f6f72864 Mon Sep 17 00:00:00 2001 From: Da Vince Date: Thu, 30 Nov 2017 19:24:26 +0100 Subject: [PATCH 2/3] change syntax for KB description --- xoptics/KB.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xoptics/KB.py b/xoptics/KB.py index abf5154..60b8a80 100755 --- a/xoptics/KB.py +++ b/xoptics/KB.py @@ -16,12 +16,11 @@ class KB: self.mode = PV(Id[:11]+':MODE').enum_strs[PV(Id[:11]+':MODE').value] def __str__(self): - return "KB is %s"%self.mode.lower() - - def __repr__(self): s = "**KB mirror**\n\n" - motors = "bend1 bend2 pitch roll yaw x y".split() for motor in motors: s+= " - %s = %.4f\n" %(motor, getattr(self,motor).wm()) return s + + def __repr__(self): + return self.__str__() From aa0aa8e1c27953b841419aa6c7eed0659d37025c Mon Sep 17 00:00:00 2001 From: Da Vince Date: Thu, 30 Nov 2017 22:59:53 +0100 Subject: [PATCH 3/3] add laser shutter to eco --- aliases/bernina.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aliases/bernina.py b/aliases/bernina.py index 62a9ebf..5fb9525 100755 --- a/aliases/bernina.py +++ b/aliases/bernina.py @@ -171,6 +171,11 @@ aliases = { 'z_und' : 142, 'desc' : '1.5M Jungfrau detector', 'eco_type' : 'devices_general.detectors.JF'}, + 'SLAAR21-LTIM01-EVR0' : { + 'alias' : 'LaserShutter', + 'z_und' : 142, + 'desc' : 'Laser Shutter', + 'eco_type' : 'loptics.laser_shutter.laser_shutter'}, # = dict( # alias = '' # z_und =