From 757e8a846dcf8ed0143608e2eb7bea2b5ab8f330 Mon Sep 17 00:00:00 2001 From: Chris Milne Date: Mon, 4 Jun 2018 18:42:12 +0200 Subject: [PATCH] added operating mode set point --- endstations/alvra_prime.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/endstations/alvra_prime.py b/endstations/alvra_prime.py index bd00539..4ff375e 100755 --- a/endstations/alvra_prime.py +++ b/endstations/alvra_prime.py @@ -51,15 +51,16 @@ class table: self.pitch = MotorRecord(Id+':W_RX') self.yaw = MotorRecord(Id+':W_RY') self.pitch = MotorRecord(Id+':W_RX') + self.modeSP = PV(Id+'MODE_SP') self.status = PV(Id+':SS_STATUS') def __str__(self): - return "Table positions\nx: %s mm\ny: %s mm\nz: %s\npitch: %s mrad\nyaw: %s mrad\nstatus: %s" \ - % (self.x.wm(),self.y.wm(),self.z.wm(),self.pitch.wm(),self.yaw.wm(),self.status.get()) + return "Table positions\nx: %s mm\ny: %s mm\nz: %s\npitch: %s mrad\nyaw: %s mrad\nmode SP: %s \nstatus: %s" \ + % (self.x.wm(),self.y.wm(),self.z.wm(),self.pitch.wm(),self.yaw.wm(),self.modeSP.get(),self.status.get()) def __repr__(self): - return "{'x': %s, 'y': %s,'z': %s,'pitch': %s, 'yaw': %s, 'status': %s}" \ - % (self.x,self.y,self.z,self.pitch,self.yaw,self.status.get()) + return "{'x': %s, 'y': %s,'z': %s,'pitch': %s, 'yaw': %s, 'mode set point': %s,'status': %s}" \ + % (self.x,self.y,self.z,self.pitch,self.yaw,self.modeSP.get(),self.status.get()) class microscope: def __init__(self,Id,alias_namespace=None):