From ab6f32b549fc526462cc4ea66ea0b1a0b47e0ceb Mon Sep 17 00:00:00 2001 From: Chris Milne Date: Tue, 26 Jun 2018 11:33:21 +0200 Subject: [PATCH] delay lines --- aliases/alvra.py | 10 +++++----- loptics/alvra_experiment.py | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/aliases/alvra.py b/aliases/alvra.py index d99745b..17ebf54 100755 --- a/aliases/alvra.py +++ b/aliases/alvra.py @@ -225,11 +225,11 @@ aliases = { 'z_und' : 142, 'desc' : 'Experiment laser optics', 'eco_type' : 'loptics.alvra_experiment.Laser_Exp'}, - 'SLAAR11-LMOT' : { - 'alias' : 'palm', - 'z_und' : 119, - 'desc' : 'PALM delay line', - 'eco_type' : 'xdiagnostics.palm.palm'}, + 'SLAAR11-LMOT' : { + 'alias' : 'Laser', + 'z_und' : 119, + 'desc' : 'Experiment laser optics', + 'eco_type' : 'loptics.alvra_experiment.Laser_Exp'}, # 'SLAAR11-LMOT' : { # 'alias' : 'palm_eo', # 'z_und' : 119, diff --git a/loptics/alvra_experiment.py b/loptics/alvra_experiment.py index 516d392..520fb16 100755 --- a/loptics/alvra_experiment.py +++ b/loptics/alvra_experiment.py @@ -18,17 +18,17 @@ class Laser_Exp: pass #Waveplate and Delay stage - self.wp = MotorRecord(Id+'-M534:MOT') + self.wp = MotorRecord(Id+'-M442:MOT') - self._pump_delayStg = MotorRecord(self.Id+'-M521:MOTOR_1') + self._pump_delayStg = MotorRecord(self.Id+'-M451: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) +# 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 self._palm_delayStg = MotorRecord(self.Id+'-M552:MOT')