bec/pxiii_bec
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updated yamls and init_beamline
CI for pxiii_bec / test (push) Successful in 31s
Details
CI for pxiii_bec / test (pull_request) Successful in 31s
Details

Browse Source
This commit is contained in:
x06da
2026-06-16 12:04:56 +02:00
parent fe325004b3
commit 56c39c07cb
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pxiii_bec/device_configs/pxiii-beamline-states.yaml
+9 -9
View File
@@ -3,7 +3,7 @@ states:
allow_modifiers: true
bl_pos: in
bl_bright: 'off'
bs_pos: in
bs_pos: out
bs_z: safe
coll_y: out
cryo_pos: in
@@ -196,14 +196,14 @@ states:
det_cov: 'close'
diag_y: out
fl_bright: 'on'
aerotech_x: in
aerotech_y: work
aerotech_z: work
aerotech_u: mount
smargon_x: mount
smargon_y: mount
smargon_chi: mount
smargon_phi: mount
#aerotech_x: in
#aerotech_y: work
#aerotech_z: work
#aerotech_u: mount
#smargon_x: mount
#smargon_y: mount
#smargon_chi: mount
#smargon_phi: mount
xrf_pos: out
pxiii_bec/device_configs/pxiii-state-devices.yaml
+3 -3
View File
@@ -48,7 +48,7 @@ bs_z:
- state
readOnly: False
softwareTrigger: false
userParameter: {"type": continuous, "min": 13, "samp": 15, "work_min": 20, "safe": 23.8, "max_blin": 24, "max_blout": 35}
userParameter: {"type": continuous, "min": 13, "samp": 15, "work_min": 20, "safe": 25, "max_blin": 26, "max_blout": 35}
coll_y:
description: Collimator Y
@@ -61,7 +61,7 @@ coll_y:
- state
readOnly: False
softwareTrigger: false
userParameter: {"type": continuous, "in": 40, "out": 20.0, "park": 0,"tol":0.05}
userParameter: {"type": continuous, "in": 25.42, "intermediate": 15, "out":5.0, "park": 0,"tol":0.05}
cryo_pos:
description: Cryo Positioner
@@ -100,7 +100,7 @@ diag_y:
- state
readOnly: False
softwareTrigger: false
userParameter: {"type": continuous, "scint": 25, "i1": 29, "out": 5.0,"park": 0,"tol":0.3}
userParameter: {"type": continuous, "scint": 22, "i1": 29, "out": 5.0,"park": 0,"tol":0.3}
fl_bright:
description: Frontlight Brightness
pxiii_bec/macros/init_beamline.py
+15 -15
View File
@@ -39,24 +39,24 @@ class Environment:
if self.device_mocks is None:
self.device_mocks = {
"aerotech_x": "mock",
"aerotech_y": "mock",
"aerotech_z": "mock",
"aerotech_u": "mock",
"aerotech_x": "real",
"aerotech_y": "real",
"aerotech_z": "real",
"aerotech_u": "real",
"bl_bright": "real",
"bl_pos": "mock",
"bs_pos": "mock",
"bs_z": "mock",
"bl_pos": "real",
"bs_pos": "real",
"bs_z": "real",
"coll_y": "real",
"cryo_pos": "real",
"det_cov": "mock",
"diag_y": "mock",
"det_cov": "real",
"diag_y": "real",
"fl_bright": "real",
"smargon_x": "mock",
"smargon_y": "mock",
"smargon_z": "mock",
"smargon_chi": "mock",
"smargon_phi": "mock",
"smargon_x": "real",
"smargon_y": "real",
"smargon_z": "real",
"smargon_chi": "real",
"smargon_phi": "real",
"xrf_pos": "mock",
}
@@ -95,7 +95,7 @@ class Environment:
"aerotech_u": "mount",
"bl_bright": "off",
"bl_pos": "out",
"bs_pos": "out",
"bs_pos": "in",
"bs_z": "safe",
"coll_y": "park",
"cryo_pos": "in",