slic/cristallina
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up attenuators

Browse Source
This commit is contained in:
steppke_a
2024-05-27 17:13:04 +02:00
parent 30fc25aea9
commit bb2eec0da6
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
beamline/components.py
View File

@ -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")

3
cristallina.py
View File

@ -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