From f131243eeea27c0158e38dfd036689ea661e8dcd Mon Sep 17 00:00:00 2001
From: Chris Milne <cjmilne@gmail.com>
Date: Tue, 26 Jun 2018 11:25:15 +0200
Subject: [PATCH] tweaks

---
 aliases/alvra.py            |  10 +--
 loptics/alvra_experiment.py | 120 ++++++++++++++++++++++++++++--------
 xdiagnostics/palm.py        |   4 +-
 3 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/aliases/alvra.py b/aliases/alvra.py
index efaf2e5..a515101 100755
--- a/aliases/alvra.py
+++ b/aliases/alvra.py
@@ -220,11 +220,11 @@ aliases = {
 #                 'z_und' : 127,
 #                 'desc' : 'Experiment laser optics',
 #                 'eco_type' : 'loptics.alvra_experiment.Laser_Exp'},
-#         'SLAAR21-LMOT' : {
-#                 'alias' : 'Las',
-#                 'z_und' : 142,
-#                 'desc' : 'Experiment laser optics',
-#                 'eco_type' : 'loptics.bernina_experiment.Laser_Exp'},
+        'SLAAR21-LMOT' : {
+                'alias' : 'Las',
+                'z_und' : 142,
+                'desc' : 'Experiment laser optics',
+                'eco_type' : 'loptics.bernina_experiment.Laser_Exp'},
          'SLAAR11-LMOT' : {
                  'alias' : 'palm',
                  'z_und' : 119,
diff --git a/loptics/alvra_experiment.py b/loptics/alvra_experiment.py
index 21ccac1..516d392 100755
--- a/loptics/alvra_experiment.py
+++ b/loptics/alvra_experiment.py
@@ -1,43 +1,109 @@
 from ..devices_general.motors import MotorRecord
 from ..devices_general.smaract import SmarActRecord
+
 from epics import PV
 from ..devices_general.delay_stage import DelayStage
+#from ..devices_general.user_to_motor import User_to_motor
 
 class Laser_Exp:
-	def __init__(self,Id):
-		self.Id = Id
+    def __init__(self,Id):
+        self.Id = Id
+
+
+
+        try:
+            self.lensx = MotorRecord('SARES20-EXP:MOT_DIODE')
+        except:
+            print('No owis lens x motor')
+            pass
+        
+        #Waveplate and Delay stage
+        self.wp = MotorRecord(Id+'-M534:MOT')
+  
+        self._pump_delayStg = MotorRecord(self.Id+'-M521:MOTOR_1')
+        self.pump_delay = DelayStage(self._pump_delayStg)
+
+        #LAM delay stages
+        self._lam_delayStg_Smar = SmarActRecord('SLAAR21-LMTS-LAM11')
+        self.lam_delay_Smar = DelayStage(self._lam_delayStg_Smar)
+
+        self._lam_delayStg = MotorRecord(self.Id+'-M548:MOT')
+        self.lam_delay = DelayStage(self._lam_delayStg)
 
         #PALM delay stages 
-		try:
-			self.palm_delay = MotorRecord(self.Id+'-M423:MOT')
-			self.palm_delayTime = DelayStage(self.palm_delay)
-		except:
-			print('No PALM delay line')
-			pass
-        
-		try:
-			self.palmEO_delay = MotorRecord(self.Id+'-M422:MOT')
-			self.palmEO_delayTime = DelayStage(self.palmEO_delay)
-		except:
-			print('No PALM-EO sampiing delay line')
-			pass
+        self._palm_delayStg = MotorRecord(self.Id+'-M552:MOT')
+        self.palm_delay = DelayStage(self._palm_delayStg)
 
         #PSEN delay stages
-		try:
-			self.psen_delay = MotorRecord(self.Id+'-M424:MOT')
-			self.psen_delayTime = DelayStage(self.psen_delay)
-		except:
-			print('No PSEN delay line')
-			pass
+        #self._psen_delayStg = MotorRecord(self.Id+'')
+        #self.psen_delay = DelayStage(self._pump_delayStg)
 
-	def get_adjustable_positions_str(self):
-		ostr = '*****Motor positions******\n'
+        #SmarAct ID
+        self.IdSA = 'SARES23'
 
-		for tkey,item in self.__dict__.items():
+        ### Mirrors used in the expeirment ###
+        try:
+            self.eos_rot = SmarActRecord(self.IdSA+'-ESB18')
+        except:
+            print('No Smaract EOSrot')
+            pass
+
+        try:
+            self.eos_gonio = SmarActRecord(self.IdSA+'-ESB3')
+        except:
+            print('No Smaract EOSGonio')
+            pass
+
+#         try:
+#             self._pump_rot = SmarActRecord(self.IdSA+'-ESB16')
+#             self.pump_rot = User_to_motor(self._pump_rot,180./35.7,0.)
+#         except:
+#             print('No Smaract THzrot')
+#             pass
+
+        try:
+            self.pump_gonio = SmarActRecord(self.IdSA+'-ESB2')
+        except:
+            print('No Smaract THzGonio')
+            pass
+        
+        try:
+            self.pump_x = SmarActRecord(self.IdSA+'-ESB1')
+        except:
+            print('No Smaract THzZ')
+            pass
+
+        try:
+            self.par_x = SmarActRecord(self.IdSA+'-ESB5')
+        except:
+            print('No Smaract ParX')
+            pass
+        try:
+            self.par_z = SmarActRecord(self.IdSA+'-ESB4')
+        except:
+            print('No Smaract ParZ')
+            pass
+
+
+    def get_adjustable_positions_str(self):
+        ostr = '*****SmarAct motor positions******\n'
+
+        for tkey,item in self.__dict__.items():
             if hasattr(item,'get_current_value'):
                 pos = item.get_current_value()
                 ostr += '  ' + tkey.ljust(10) + ' : % 14g\n'%pos
-		return ostr
+        return ostr
+                
 
-	def __repr__(self):
-		return self.get_adjustable_positions_str()
+
+    #def pos(self):
+    #    s = []
+    #    for i in sorted(self.__dict__.keys()):
+    #        s.append[i]
+    #    for n, mo^tor in enumerate (s):
+    #        s[n] += ':  ' + str(self.__dict__[motor])
+    #    return s
+
+    def __repr__(self):
+        return self.get_adjustable_positions_str()
+        
diff --git a/xdiagnostics/palm.py b/xdiagnostics/palm.py
index 86fce13..c50fe09 100755
--- a/xdiagnostics/palm.py
+++ b/xdiagnostics/palm.py
@@ -10,8 +10,8 @@ class palm:
         self.delay = MotorRecord(self.Id+'-M423:MOT')
         self.delayTime = DelayStage(self.delay)
 		
-		self.delay2 = MotorRecord(self.Id+'-M422:MOT')
-        self.delayTime2 = DelayStage(self.delay)
+# 		self.delay2 = MotorRecord(self.Id+'-M422:MOT')
+#         self.delayTime2 = DelayStage(self.delay)
 
     def get_adjustable_positions_str(self):
         ostr = '***** PALM motor positions ******\n'