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

Setting up all slits to have consistent naming and definitions

Browse Source
This commit is contained in:
vonka_j
2025-03-27 15:54:21 +01:00
parent 8a6f254dc8
commit ea8b8d6058
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beamline/components.py
View File

@ -8,9 +8,11 @@ from .alignment_laser import AlignmentLaser
from slic.devices.xoptics.kb import KBHor, KBVer from slic.devices.xoptics.kb import KBHor, KBVer
from slic.devices.xoptics.offsetmirrors import OffsetMirror from slic.devices.xoptics.offsetmirrors import OffsetMirror
from slic.devices.xoptics.slits import SlitUnitCenterWidth
from .pp_shutter import PP_Shutter from .pp_shutter import PP_Shutter
from .i0_chamber import i0_chamber from .i0_chamber import i0_chamber
from .apertures import slits107, slits149
# Attenuators # Attenuators
upstream_attenuator = Attenuator("SARFE10-OATT053", description="Aramis attenuator OATT053") upstream_attenuator = Attenuator("SARFE10-OATT053", description="Aramis attenuator OATT053")
@ -58,6 +60,14 @@ pbps149 = IntensityMonitorPBPS(
description="Intensity/position monitor in the experimental hutch", description="Intensity/position monitor in the experimental hutch",
) )
# I0 chamber
i0 = i0_chamber('SARES30-MCS20610')
# Slits
slits149 = SlitUnitCenterWidth('SAROP31-OAPU149')
slits107 = SlitUnitCenterWidth('SAROP31-OAPU107')
slitsi0 = i0.slits
# KB mirrors # KB mirrors
kbHor = KBHor("SAROP31-OKBH154", description="Cristallina horizontal KB mirror") kbHor = KBHor("SAROP31-OKBH154", description="Cristallina horizontal KB mirror")
kbVer = KBVer("SAROP31-OKBV153", description="Cristallina vertical KB mirror") kbVer = KBVer("SAROP31-OKBV153", description="Cristallina vertical KB mirror")
@ -69,5 +79,3 @@ mono = CristallinaMono("SAROP31-ODCC110")
m3 = OffsetMirror('SAROP31-ODMV152') m3 = OffsetMirror('SAROP31-ODMV152')
#TODO the other two offset mirros #TODO the other two offset mirros
# I0 chamber
i0 = i0_chamber('SARES30-MCS20610')

19
beamline/i0_chamber.py
View File

@ -1,4 +1,4 @@
from slic.core.device import Device from slic.core.device import Device, SimpleDevice
from slic.core.adjustable import PVAdjustable from slic.core.adjustable import PVAdjustable
from slic.devices.general.motor import Motor from slic.devices.general.motor import Motor
@ -6,20 +6,25 @@ class i0_chamber(Device):
def __init__(self, ID, name="Cristallina I0 chamber with slits and foils", process_time=1, **kwargs): def __init__(self, ID, name="Cristallina I0 chamber with slits and foils", process_time=1, **kwargs):
super().__init__(ID, name=name, **kwargs) super().__init__(ID, name=name, **kwargs)
self.foils = Motor(ID+":MCS3", name="Cristallina I0 chamber foil selecting smaract stage") self.foils = Motor(ID+":MCS3")
self.slits = i0_slits_unit(ID,name="Cristallina I0 chamber slits") self.slits = i0_slits_unit(ID,name="Cristallina I0 chamber slits")
class i0_slits_unit(Device): class i0_slits_unit(Device):
def __init__(self, ID, **kwargs): def __init__(self, ID, **kwargs):
super().__init__(ID, **kwargs) super().__init__(ID, **kwargs)
self.x_center = PVAdjustable(ID + "-XSLIT:SLIT_POS") self.x = SimpleDevice(ID + "-X",
self.width = PVAdjustable(ID + "-XSLIT:SLIT_WIDTH") center = PVAdjustable(ID + "-XSLIT:SLIT_POS",units='mm'),
self.y_center = PVAdjustable(ID + "-YSLIT:SLIT_POS") width = PVAdjustable(ID + "-XSLIT:SLIT_WIDTH",units='mm')
self.height = PVAdjustable(ID + "-YSLIT:SLIT_WIDTH") )
self.y = SimpleDevice(ID + "-Y",
center = PVAdjustable(ID + "-YSLIT:SLIT_POS",units='mm'),
width = PVAdjustable(ID + "-YSLIT:SLIT_WIDTH",units='mm')
)
self.motors = i0_slits_motors(ID,name='Individual I0 chamber slit motors') self.motors = i0_slits_motors(ID,name='Individual I0 chamber slit motors')
class i0_slits_motors(Device): class i0_slits_motors(Device):
def __init__(self, ID, **kwargs): def __init__(self, ID, **kwargs):
super().__init__(ID, **kwargs) super().__init__(ID, **kwargs)

2
channels/bs_channels.py
View File

@ -9,7 +9,7 @@ from slic.core.acquisition.detcfg import DetectorConfig
detectors = [ detectors = [
"JF16T03V02", # 1.5M from 2025 "JF16T03V02", # 1.5M from 2025
# "JF16T03V01", # 1.5M from 2022 # "JF16T03V01", # 1.5M from 2022
# "JF17T16V01", # 8M "JF17T16V01", # 8M
"JF20T01V01", # IO "JF20T01V01", # IO
# "JF05T01V01", # 0.5M stripsel borrowed from Bernina, now registered in esc network # "JF05T01V01", # 0.5M stripsel borrowed from Bernina, now registered in esc network
] ]

3
cristallina.py
View File

@ -105,6 +105,7 @@ from beamline.components import (
pulsepicker, pulsepicker,
alignment_laser, alignment_laser,
pbps113, pbps113,
slits107,slits149,slitsi0,
mono, mono,
m3, m3,
i0, i0,
@ -114,7 +115,7 @@ from beamline.components import kbHor, kbVer
from systems.components import cta from systems.components import cta
from gp_exp.components import Newport_large, OWIS from gp_exp.components import Newport_large, OWIS, slitsjj

4
gp_exp/components.py
View File

@ -1,6 +1,8 @@
from slic.devices.general.motor import Motor from slic.devices.general.motor import Motor
from gp_exp.jj_device_def import SlitUnitCenterWidthJJ
OWIS = Motor("SARES30-MOBI1:MOT_6") # small OWIS linear stage OWIS = Motor("SARES30-MOBI1:MOT_6") # small OWIS linear stage
Newport_large = Motor("SARES30-MOBI1:MOT_5") Newport_large = Motor("SARES30-MOBI1:MOT_5")
slitsjj = SlitUnitCenterWidthJJ("SARES30-MOBI2", motor_naming="MOT")