diff --git a/aliases/bernina.py b/aliases/bernina.py index 10f40af..62a9ebf 100755 --- a/aliases/bernina.py +++ b/aliases/bernina.py @@ -161,6 +161,11 @@ aliases = { 'z_und' : 142, 'desc' : 'Experiment laser optics', 'eco_type' : 'loptics.bernina_experiment.Laser_Exp'}, + 'SLAAR01-TSPL-EPL' : { + 'alias' : 'PhaseShifter', + 'z_und' : 142, + 'desc' : 'Experiment laser phase shifter', + 'eco_type' : 'devices_general.timing.PhaseShifterAramis'}, 'http://sf-daq-1:10000' : { 'alias' : 'DetJF', 'z_und' : 142, diff --git a/loptics/bernina_experiment.py b/loptics/bernina_experiment.py index 9b1b52e..4f0aafc 100755 --- a/loptics/bernina_experiment.py +++ b/loptics/bernina_experiment.py @@ -7,6 +7,8 @@ class Laser_Exp: self.Id = Id self.delay_stage_offset =160. + + ### Mirrors used in the expeirment ### try: self.phi = MotorRecord(Id+'-M517:MOT') @@ -19,10 +21,10 @@ class Laser_Exp: print('No Standa steering theta mirror') pass + #Waveplate and Delay stage + self.wp = MotorRecord(Id+'-M533:MOT') self.delay_stage = MotorRecord(Id+'-M521:MOTOR_1') - - def get_delay(self): motor_pos = self.delay_stage.wm()