diff --git a/aliases/alvra.py b/aliases/alvra.py index c31359a..50bf77f 100755 --- a/aliases/alvra.py +++ b/aliases/alvra.py @@ -4,76 +4,81 @@ elog = {'url': 'https://elog-gfa.psi.ch/Alvra', aliases = { # Front-End components 'SARFE10-OPSH044' : { - 'alias' : 'ShutUnd', + 'alias' : 'shutUnd', 'z_und' : 44, 'desc' : 'Photon shutter after Undulator'}, 'SARFE10-OAPU044' : { - 'alias' : 'SlitUnd', + 'alias' : 'slitUnd', 'z_und' : 44, 'desc' : 'Slit after Undulator', 'eco_type' : 'xoptics.slits.SlitFourBlades'}, 'SARFE10-PBIG050' : { - 'alias' : 'GasMon', + 'alias' : 'gasMon', 'z_und' : 50, 'desc' : 'Gas Monitor Intensity (PBIG)'}, 'SARFE10-PBPS053' : { - 'alias' : 'PBPSUnd', + 'alias' : 'pbpsUnd', 'z_und' : 44, 'desc' : 'Intensity position monitor after Undulator (PBPS)'}, 'SARFE10-OATT053' : { - 'alias' : 'AttFE', + 'alias' : 'attFE', 'z_und' : 53, 'desc' : 'Attenuator in Front End', 'eco_type' : 'xoptics.attenuator_aramis.AttenuatorAramis'}, 'SARFE10-PPRM053' : { - 'alias' : 'ProfFE', + 'alias' : 'screenFE', 'z_und' : 53, 'desc' : 'Profile monitor after single-shot spectrometer (PPRM)', 'eco_type' : 'xdiagnostics.profile_monitors.Pprm'}, 'SARFE10-SBST060' : { - 'alias' : 'ShutFE', + 'alias' : 'shutFE', 'z_und' : 60, 'desc' : 'Photon shutter in the end of Front End'}, # Optics hutch components 'SARFE10-PPRM064' : { - 'alias' : 'ProfOP', + 'alias' : 'screenOP', 'z_und' : 64, 'desc' : 'Profile monitor after Front End', 'eco_type' : 'xdiagnostics.profile_monitors.Pprm'}, 'SAROP11-OOMH064' : { - 'alias' : 'MirrAlv1', + 'alias' : 'mirrorAlv1', 'z_und' : 64, 'desc' : 'First Alvra Horizontal offset mirror (OMH064)'}, 'SAROP11-PPRM066' : { - 'alias' : 'ProfMirrAlv1', + 'alias' : 'screenMirrAlv1', 'z_und' : 66, 'desc' : 'Profile monitor after Alvra Mirror 1 (PPRM)', 'eco_type' : 'xdiagnostics.profile_monitors.Pprm'}, 'SAROP11-OOMH076' : { - 'alias' : 'MirrAlv2', + 'alias' : 'mirrorAlv2', 'z_und' : 76, 'desc' : 'Second Alvra Horizontal offset mirror (OMH076)'}, 'SAROP11-PPRM078' : { - 'alias' : 'ProfMirrAlv2', + 'alias' : 'screenMirrAlv2', 'z_und' : 78, 'desc' : 'Profile monitor after Alvra Mirror 2 (PPRM)', 'eco_type' : 'xdiagnostics.profile_monitors.Pprm'}, 'SAROP11-OAPU104' : { - 'alias' : 'SlitSwitch', + 'alias' : 'slitSwitch', 'z_und' : 104, 'desc' : 'Slit in Optics hutch after Photon switchyard and before Alvra mono', 'eco_type' : 'xoptics.slits.SlitBlades'}, 'SAROP11-ODCM105' : { - 'alias' : 'Mono', + 'alias' : 'mono', 'z_und' : 105, 'desc' : 'Alvra DCM Monochromator', 'eco_type' : 'xoptics.dcm.Double_Crystal_Mono'}, +# 'ALVRA' : { +# 'alias' : 'mono_FEL', +# 'z_und' : 105, +# 'desc' : 'Joint mono-FEL energy device', +# 'eco_type' : 'xoptics.dcm.alvra_mono_FEL'}, # 'SAROP11-PSCR106' : { # 'alias' : 'ProfMono', # 'z_und' : 106, # 'desc' : 'Profile Monitor after Mono (PSCR)'}, 'SAROP11-OOMV108' : { - 'alias' : 'MirrV1', + 'alias' : 'mirrorV1', 'z_und' : 108, 'desc' : 'Alvra Vertical offset Mirror 1 (OMV108)'}, # 'SAROP11-PSCR109' : { @@ -81,31 +86,31 @@ aliases = { # 'z_und' : 109, # 'desc' : 'Profile Monitor after Vertical Mirror 1 (PSCR)'}, 'SAROP11-OOMV109' : { - 'alias' : 'MirrV2', + 'alias' : 'mirrorV2', 'z_und' : 109, 'desc' : 'Alvra Vertical offset Mirror 2 (OMV109)'}, 'SAROP11-PPRM110' : { - 'alias' : 'ProfMirrV2', + 'alias' : 'screenMirrorV2', 'z_und' : 110, 'desc' : 'Profile monitor after Vertical Mirror 2 (PPRM)', 'eco_type' : 'xdiagnostics.profile_monitors.Pprm'}, 'SAROP11-OPPI110' : { - 'alias' : 'PulsePicker', + 'alias' : 'pulsePicker', 'z_und' : 110, 'desc' : 'X-ray pulse picker'}, 'SAROP11-SBST114' : { - 'alias' : 'ShutOpt', + 'alias' : 'shutOpt', 'z_und' : 114, 'desc' : 'Shutter after Optics hutch'}, ## Experimental hutch components 'SAROP11-PBPS117' : { - 'alias' : 'PBPSOpt', + 'alias' : 'pbpsOpt', 'z_und' : 117, 'desc' : 'Intensity/position monitor after Optics hutch (PBPS)', 'eco_type' : 'xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS', 'kwargs' : {'VME_crate':'SAROP11-CVME-PBPS1','link':9} }, 'SAROP11-PPRM117' : { - 'alias' : 'ProfOPEnd', + 'alias' : 'screenOPEnd', 'z_und' : 117, 'desc' : 'Profile monitor after Optics hutch (PPRM)', 'eco_type' : 'xdiagnostics.profile_monitors.Pprm'}, @@ -118,38 +123,38 @@ aliases = { 'z_und' : 119, 'desc' : 'Timing diagnostics spectral encoding (PSEN)'}, 'SAROP11-OATT120' : { - 'alias' : 'AttExp', + 'alias' : 'attExp', 'z_und' : 120, 'desc' : 'Attenuator Alvra', 'eco_type' : 'xoptics.attenuator_aramis.AttenuatorAramis'}, 'SAROP11-OAPU120' : { - 'alias' : 'SlitAttExp', + 'alias' : 'slitAttExp', 'z_und' : 120, 'desc' : 'Slits behind attenuator', 'eco_type' : 'xoptics.slits.SlitPosWidth'}, 'SAROP11-OLAS120' : { - 'alias' : 'RefLaser', + 'alias' : 'refLaser', 'z_und' : 120, 'desc' : 'Alvra beamline reference laser before KBs (OLAS)', 'eco_type' : 'xoptics.reflaser.RefLaser_Aramis'}, 'SAROP11-PBPS122' : { - 'alias' : 'PBPSAtt', + 'alias' : 'pbpsAtt', 'z_und' : 122, 'desc' : 'Intensity/Position monitor after Attenuator', 'eco_type' : 'xdiagnostics.intensity_monitors.SolidTargetDetectorPBPS', 'kwargs' : {'VME_crate':'SAROP11-CVME-PBPS1','link':9} }, 'SAROP11-PPRM122' : { - 'alias' : 'ProfAtt', + 'alias' : 'screenAtt', 'z_und' : 122, 'desc' : 'Profile monitor after Attenuator', 'eco_type' : 'xdiagnostics.profile_monitors.Pprm'}, 'SAROP11-OKBV123' : { - 'alias' : 'KbVer', + 'alias' : 'kbVer', 'z_und' : 123, 'desc' : 'Alvra vertical KB mirror', 'eco_type' : 'xoptics.KBver.KBver'}, 'SAROP11-OKBH124' : { - 'alias' : 'KbHor', + 'alias' : 'kbHor', 'z_und' : 124, 'desc' : 'Alvra horizontal KB mirror', 'eco_type' : 'xoptics.KBhor.KBhor'}, @@ -167,22 +172,22 @@ aliases = { # 'kwargs' : {'VME_crate':'SAROP11-CVME-PBPS1','link':9} }, 'SARES11-XSAM125' : { - 'alias' : 'PrimeSample', + 'alias' : 'primeSample', 'z_und' : 127, 'desc' : 'Sample XYZ manipulator', 'eco_type' : 'endstations.alvra_prime.huber'}, 'SARES11-XCRY125' : { - 'alias' : 'PrimeCryTrans', + 'alias' : 'primeCryTrans', 'z_und' : 127, 'desc' : 'Prime von Hamos X-trans (Bragg)', 'eco_type' : 'endstations.alvra_prime.vonHamosBragg'}, 'SARES11-XOTA125' : { - 'alias' : 'PrimeTable', + 'alias' : 'primeTable', 'z_und' : 127, 'desc' : 'Prime optical table', 'eco_type' : 'endstations.alvra_prime.table'}, 'SARES11-XMI125' : { - 'alias' : 'PrimeMicroscope', + 'alias' : 'primeMicroscope', 'z_und' : 127, 'desc' : 'Microscope focus and zoom', 'eco_type' : 'endstations.alvra_prime.microscope'}, @@ -210,16 +215,16 @@ aliases = { 'z_und' : 127, 'desc' : 'Experiment laser phase shifter (Globi)', 'eco_type' : 'devices_general.alvratiming.PhaseShifterAramis'}, -# 'SLAAR11-LMOT' : { -# 'alias' : 'Las', -# 'z_und' : 119, -# 'desc' : 'Experimental laser devices', -# 'eco_type' : 'loptics.alvra_experiment.Laser_Exp'}, 'SLAAR11-LMOT' : { - 'alias' : 'palm', + 'alias' : 'Laser', 'z_und' : 119, - 'desc' : 'PALM delay line', - 'eco_type' : 'xdiagnostics.palm.palm'}, + 'desc' : 'Experimental laser devices', + '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' : 'palm_eo', # 'z_und' : 119, diff --git a/loptics/alvra_experiment.py b/loptics/alvra_experiment.py index 25f6cb3..9785916 100755 --- a/loptics/alvra_experiment.py +++ b/loptics/alvra_experiment.py @@ -7,7 +7,7 @@ from ..devices_general.user_to_motor import User_to_motor class Laser_Exp: def __init__(self,Id): - self.Id = Id + self.Id = Id @@ -31,15 +31,15 @@ class Laser_Exp: # self.lam_delay = DelayStage(self._lam_delayStg) #PALM delay stages - self.palm_delay = MotorRecord(self.Id+'-M423:MOT') - self.palm_delayTime = DelayStage(self.palm_delay) + self.palm_delay = MotorRecord(self.Id+'-M423:MOT') + self.palm_delayTime = DelayStage(self.palm_delay) self.palmEO_delay = MotorRecord(self.Id+'-M422:MOT') - self.palmEO_delayTime = DelayStage(self.palmEO_delay) + self.palmEO_delayTime = DelayStage(self.palmEO_delay) #PSEN delay stages - self.psen_delay = MotorRecord(self.Id+'-M424:MOT') - self.psen_delayTime = DelayStage(self.psen_delay) + self.psen_delay = MotorRecord(self.Id+'-M424:MOT') + self.psen_delayTime = DelayStage(self.psen_delay) #SmarAct ID # self.IdSA = 'SARES23' @@ -89,7 +89,7 @@ class Laser_Exp: def get_adjustable_positions_str(self): - ostr = '*****SmarAct motor positions******\n' + ostr = '*****Motor positions******\n' for tkey,item in self.__dict__.items(): if hasattr(item,'get_current_value'):