Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed string from motor

Browse Source
This commit is contained in:
Chris Milne
2018-06-04 18:14:22 +02:00
parent fc319575f9
commit db85e12e82
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
endstations/alvra_prime.py
+4 -5
View File
@@ -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):
instruments/alvra.py
+1 -1
View File
@@ -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')