Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delay lines

Browse Source
This commit is contained in:
Chris Milne
2018-06-26 11:33:21 +02:00
parent 8ffe75084b
commit ab6f32b549
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aliases/alvra.py
+5 -5
View File
@@ -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,
loptics/alvra_experiment.py
+7 -7
View File
@@ -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')