From 6b45b72e208c7415610ac98b31dbc0d6dc0de42e Mon Sep 17 00:00:00 2001
From: Roman Mankowsky <mankowksy_r@psi.ch>
Date: Wed, 8 Nov 2017 12:25:28 +0100
Subject: [PATCH] Added steering mirror to /loptics and /ldiagnostics folders

---
 aliases/bernina.py                            |   7 +++-
 endstations/gps_platform.py                   |  31 ------------------
 .../profile_monitors.cpython-35.pyc           | Bin 1473 -> 1445 bytes
 xdiagnostics/profile_monitors.py              |   4 +--
 4 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100755 endstations/gps_platform.py

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 f7f6b952096783003a4ecd79e44eba159faeca90..33170cbe7d2be336e14832e128e380997d24b297 100644
GIT binary patch
delta 426
zcmX@ey_B0%jF*>d+j+*Q*omCG7|ka$vWS|uFfc?hGo%0!3quMkLklBA6p+EjkiyOY
zl41o(1#5ELVhJcH%1vfsfB>e+B8<}nm~OEYr{<&;u>%EHG8A!7KFwIc=r`G!sfC*x
zC{zR{cqU(Bsun=vgJk$8$1(>6@q(CwU_M+qnnE_91PB*{2p&crHh%UZ5HlHw;Q-_+
z2Out%0eMLU?xkQ&mRmedsYQ92d5Q56u92=t?zdwpm0>F40_p-gAL3SsgF#}vldrI7
z+WKj-6p4Viq98&HECC`Ajzs7X2TDi)aWTj>Jd8!+lPy_8jX|Q=l;7g8$<0qG%}KRm
R1nJ=b5(10@Oae^8LI6)yK$!pl

delta 438
zcmZ3=eUO_|jF*=yZU$pi`$W!NidGB^45<tZQH%^JK$3|e1;_xB%nU7z3{lKL?!<>u
zVvG#InjE)S0t$+9{gRo1IzWJVvH;^WMdn*9#i==IMeIP4Tl|SRnTf^md5O8H#RZAU
zsVf<ZcqVUSteC9N)WXdJR8a&bcqi{;sun=vgJc9Idol;r^MRN`U_M+qnnE_91PB*{
z2p&d$Hh%UZ5HlHw;Q-`F2Out%2NHPw2lN`tEgq-TqP)z!M1lAS*GN}nKdP~mDl!*w
z0ZjpWv4|VQLUR${<n1h)HkvF&q992z5FrjCz@9;<1+#cT5)wcHgo~Mg1P^18#AI34
QP*IQwlF<<5liOM409A)YkpKVy

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)