From bb2eec0da607011a5e11c100c512475abff2b14f Mon Sep 17 00:00:00 2001 From: Alexander Steppke Date: Mon, 27 May 2024 17:13:04 +0200 Subject: [PATCH] cleaned up attenuators --- beamline/components.py | 13 ++----------- cristallina.py | 3 --- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/beamline/components.py b/beamline/components.py index c7bc059..b74e926 100644 --- a/beamline/components.py +++ b/beamline/components.py @@ -8,13 +8,10 @@ from slic.devices.xoptics.kb import KBHor, KBVer from .pp_shutter import PP_Shutter - +# Attenuators upstream_attenuator = Attenuator("SARFE10-OATT053", description="Aramis attenuator OATT053") - attenuator = Attenuator("SAROP31-OATA150", description="Cristallina attenuator OATA150") - - # Shutter shutter = PP_Shutter( "SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", name="Cristallina pulse picker shutter" @@ -28,11 +25,6 @@ pulsepicker = PulsePicker( ) -front_end_attenuator = Attenuator( - "SARFE10-OATT053", description="Front end attenuator OATT053" -) - - # Alignment laser alignment_laser = AlignmentLaser( "SAROP31-OLAS147:MOTOR_1", name="Cristallina alignment laser OLAS147" @@ -52,7 +44,6 @@ pbps149 = IntensityMonitorPBPS( description="Intensity/position monitor in the experimental hutch", ) - - +# KB mirrors kbHor = KBHor("SAROP31-OKBH154", description="Cristallina horizontal KB mirror") kbVer = KBVer("SAROP31-OKBV153", description="Cristallina vertical KB mirror") diff --git a/cristallina.py b/cristallina.py index b3943c3..a2d90ae 100644 --- a/cristallina.py +++ b/cristallina.py @@ -84,15 +84,12 @@ from spreadsheet import overview ################# DEVICES ################# dummy = DummyAdjustable(units="au") -# Attenuators -#from slic.devices.xoptics.aramis_attenuator import Attenuator #from devices.knife_edge import KnifeEdge #from devices.standa import standa #from devices.newport import newport - from beamline.components import upstream_attenuator, attenuator, shutter, pulsepicker, front_end_attenuator from beamline.components import kbHor, kbVer