diff --git a/aliases/bernina.py b/aliases/bernina.py index 7f02464..066e607 100755 --- a/aliases/bernina.py +++ b/aliases/bernina.py @@ -112,12 +112,17 @@ aliases = { 'alias' : 'Gps', 'z_und' : 142, 'desc' : 'General purpose station', - 'eco_type' : 'endstations.gps_platform.GPS'}, + 'eco_type' : 'endstations.bernina_gps.GPS'}, 'SARES20-PROF142-M1' : { 'alias' : 'Xeye', 'z_und' : 142, 'desc' : 'General purpose station', 'eco_type' : 'xdiagnostics.profile_monitors.Bernina_XEYE'}, + 'SLAAR21-LMOT' : { + 'alias' : 'LasExp', + 'z_und' : 142, + 'desc' : 'Experiment laser optics', + 'eco_type' : 'loptics.bernina_experiment.Laser_Exp'}, # = dict( # alias = '' # z_und = diff --git a/endstations/gps_platform.py b/endstations/gps_platform.py deleted file mode 100755 index ac514fe..0000000 --- a/endstations/gps_platform.py +++ /dev/null @@ -1,31 +0,0 @@ -import sys -sys.path.append("..") -from ..devices_general.motors import MotorRecord - -class GPS: - def __init__(self,Id,alias_namespace=None): - self.Id = Id - - ### motors gps table ### - self.x = MotorRecord(Id+':MOT_GPS_TBL_TX') - self.y = MotorRecord(Id+':MOT_GPS_TBL_TZ') - self.z = MotorRecord(Id+':MOT_GPS_TBL_TY') - self.th = MotorRecord(Id+':MOT_GPS_MY_RYTH') - try: - self.pitch = MotorRecord(Id+':MOT_GPS_TILT_RX') - except: - print ('GPS.pitch not found') - pass - try: - self.roll = MotorRecord(Id+':MOT_GPS_TILT_RY') - except: - print ('GPS.roll not found') - pass - - ### motors hl gonio ### - self.xmu = MotorRecord(Id+':MOT_GPS_PROBE_TX') - self.mu = MotorRecord(Id+':MOT_GPS_PROBE_RX') - self.tth = MotorRecord(Id+':MOT_GPS_NY_RY2TH') - self.xhl = MotorRecord(Id+':MOT_GPS_TX') - self.yhl = MotorRecord(Id+':MOT_GPS_TY') - diff --git a/xdiagnostics/__pycache__/profile_monitors.cpython-35.pyc b/xdiagnostics/__pycache__/profile_monitors.cpython-35.pyc index f7f6b95..33170cb 100644 Binary files a/xdiagnostics/__pycache__/profile_monitors.cpython-35.pyc and b/xdiagnostics/__pycache__/profile_monitors.cpython-35.pyc differ diff --git a/xdiagnostics/profile_monitors.py b/xdiagnostics/profile_monitors.py index 3f0c1e6..13eb1fd 100755 --- a/xdiagnostics/profile_monitors.py +++ b/xdiagnostics/profile_monitors.py @@ -4,7 +4,7 @@ from ..devices_general.detectors import CameraCA from epics import PV class Pprm: - def __init__(self,Id,alias_namespace=None): + def __init__(self,Id): self.Id = Id self.targetY = MotorRecord(Id+':MOTOR_PROBE') self.cam = CameraCA(Id) @@ -22,7 +22,7 @@ class Pprm: class Bernina_XEYE: - def __init__(self,Id,alias_namespace=None): + def __init__(self,Id): self.Id = Id self.zoom = MotorRecord('SARES20-EXP:MOT_ZOOM.VAL') self.cam = CameraCA(Id)