diff --git a/endstations/alvra_prime.py b/endstations/alvra_prime.py index 26a3a2d..b86e590 100755 --- a/endstations/alvra_prime.py +++ b/endstations/alvra_prime.py @@ -51,15 +51,14 @@ class table: self.pitch = MotorRecord(Id+':W_RX') self.yaw = MotorRecord(Id+':W_RY') self.pitch = MotorRecord(Id+':W_RX') - self.status = MotorRecord(Id+':SS_STATUS') def __str__(self): - return "Table positions\nx: %s mm\ny: %s mm\nz: %s\npitch: %s mm\nyaw: %s mm\nstatus: %s" \ - % (self.x.wm(),self.y.wm(),self.z.wm(),self.pitch.wm(),self.yaw.wm(),self.status.wm()) + return "Table positions\nx: %s mm\ny: %s mm\nz: %s\npitch: %s mm\nyaw: %s mm" \ + % (self.x.wm(),self.y.wm(),self.z.wm(),self.pitch.wm(),self.yaw.wm()) 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) + return "{'x': %s, 'y': %s,'z': %s,'pitch': %s, 'yaw': %s}" \ + % (self.x,self.y,self.z,self.pitch,self.yaw) class microscope: def __init__(self,Id,alias_namespace=None): diff --git a/instruments/alvra.py b/instruments/alvra.py index 310f7b2..3d13ca3 100755 --- a/instruments/alvra.py +++ b/instruments/alvra.py @@ -125,7 +125,7 @@ bsdaqPhotonDiag = BStools(default_channel_list=channellistPhotonDiag,default_fil from eco.devices_general.alvradetectors import DIAClient #JF_4p5M = JF_BS_writer('JF_4p5M', api_address = "http://sf-daq-2:10000") -dia = DIAClient('JF_4p5M', api_address = "http://sf-daq-2:10000", instrument="bernina") +# dia = DIAClient('JF_4p5M', api_address = "http://sf-daq-2:10000", instrument="alvra") checkerPV=PV('SARFE10-PBPG050:HAMP-INTENSITY-CAL')