From 3b08091f800e317f4a888dc5ae4c2f8d1e0631ee Mon Sep 17 00:00:00 2001 From: Sven Augustin Date: Fri, 18 Jun 2021 12:21:49 +0200 Subject: [PATCH] made Huber more general (works for flex and prime) --- slic/devices/endstations/alvra_prime.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slic/devices/endstations/alvra_prime.py b/slic/devices/endstations/alvra_prime.py index b6a50b358..d23c71d68 100644 --- a/slic/devices/endstations/alvra_prime.py +++ b/slic/devices/endstations/alvra_prime.py @@ -5,13 +5,13 @@ from ..general.smaract import SmarActAxis class Huber: - def __init__(self, Id, alias_namespace=None, z_undulator=None, description=None): + def __init__(self, Id, alias_namespace=None, z_undulator=None, description=None, name="Prime Sample Manipulator"): self.Id = Id ### Huber sample stages ### - self.x = Motor(Id + ":MOTOR_X1", "Prime Sample X Manipulator") - self.y = Motor(Id + ":MOTOR_Y1", "Prime Sample Y Manipulator") - self.z = Motor(Id + ":MOTOR_Z1", "Prime Sample Z Manipulator") + self.x = Motor(Id + ":MOTOR_X1", name + " X") + self.y = Motor(Id + ":MOTOR_Y1", name + " Y") + self.z = Motor(Id + ":MOTOR_Z1", name + " Z") def __str__(self): return "Huber Sample Stage %s\nx: %s mm\ny: %s mm\nz: %s mm" % (self.Id, self.x.wm(), self.y.wm(), self.z.wm())