From acd92d903d2f1a31976ef4fd1acc2fee39db9713 Mon Sep 17 00:00:00 2001 From: x10sa Date: Wed, 4 Nov 2026 09:16:03 +0100 Subject: [PATCH] fix: correct entry points --- pxii_bec/device_configs/pxii-devices.yaml | 362 +++++++++++----------- pxii_bec/scripts/init_beamline.py | 9 +- pyproject.toml | 4 +- 3 files changed, 189 insertions(+), 186 deletions(-) diff --git a/pxii_bec/device_configs/pxii-devices.yaml b/pxii_bec/device_configs/pxii-devices.yaml index 57171f7..50fe646 100755 --- a/pxii_bec/device_configs/pxii-devices.yaml +++ b/pxii_bec/device_configs/pxii-devices.yaml @@ -21,7 +21,6 @@ # Default values may be omitted for brevity. ########################################################################################################################## - # An example device configuration with all fields: # device1: @@ -30,7 +29,7 @@ # deviceConfig: # delay: 1 # update_frequency: 10 -# deviceTags: +# deviceTags: # - frontend # - motor # enabled: true @@ -48,19 +47,18 @@ ########################################################################################################################## - aerotech: description: REST-based device which connects to AareScan and Aerotech deviceClass: pxii_bec.devices.Aerotech deviceConfig: prefix: http://mx-x10sa-queue-01:5234 - vel_u_deg_s: 5 + vel_u_deg_s: 30 vel_x_mm_s: 0.1 vel_y_mm_s: 0.1 vel_z_mm_s: 0.1 deviceTags: - - aerotech - - motors + - aerotech + - motors enabled: true onFailure: buffer readoutPriority: baseline @@ -85,7 +83,7 @@ bcu_bpm1: auto_monitor: true read_pv: X10SA-ES-BCBPM:Current1:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -97,7 +95,7 @@ bcu_bpm2: auto_monitor: true read_pv: X10SA-ES-BCBPM:Current2:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -109,7 +107,7 @@ bcu_bpm3: auto_monitor: true read_pv: X10SA-ES-BCBPM:Current3:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -121,7 +119,7 @@ bcu_bpm4: auto_monitor: true read_pv: X10SA-ES-BCBPM:Current4:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -132,7 +130,7 @@ bcu_bpm_x: deviceConfig: prefix: X10SA-ES-BCBPM:TRX deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -142,7 +140,7 @@ bcu_bpm_y: deviceConfig: prefix: X10SA-ES-BCBPM:TRY deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -153,7 +151,7 @@ bcu_bpmsum: auto_monitor: true read_pv: X10SA-ES-BCBPM:SumAll:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -165,7 +163,7 @@ bcu_shutter: auto_monitor: true read_pv: X10SA-ES-SHUTTER:SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -175,7 +173,7 @@ bcu_sl_xcen: deviceConfig: prefix: X10SA-ES-BCSLH:CENTER deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -185,7 +183,7 @@ bcu_sl_xr: deviceConfig: prefix: X10SA-ES-BCSLH:TRXR deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -195,7 +193,7 @@ bcu_sl_xsize: deviceConfig: prefix: X10SA-ES-BCSLH:SIZE deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -205,7 +203,7 @@ bcu_sl_xw: deviceConfig: prefix: X10SA-ES-BCSLH:TRXW deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -215,7 +213,7 @@ bcu_sl_yb: deviceConfig: prefix: X10SA-ES-BCSLV:TRYB deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -225,7 +223,7 @@ bcu_sl_ycen: deviceConfig: prefix: X10SA-ES-BCSLV:CENTER deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -235,7 +233,7 @@ bcu_sl_ysize: deviceConfig: prefix: X10SA-ES-BCSLV:SIZE deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -245,7 +243,7 @@ bcu_sl_yt: deviceConfig: prefix: X10SA-ES-BCSLV:TRYT deviceTags: - - bcu + - bcu enabled: true onFailure: buffer readoutPriority: baseline @@ -256,13 +254,13 @@ bl_bright: auto_monitor: true read_pv: X10SA-ES-BL:SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline userParameter: - 'off': 0.0 - 'on': 1.3 + "off": 0.0 + "on": 1.3 tol: 0.01 type: continuous bl_pos: @@ -272,7 +270,7 @@ bl_pos: auto_monitor: true read_pv: X10SA-ES-BL:POS-SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -287,7 +285,7 @@ bs_pos: auto_monitor: true read_pv: X10SA-ES-BS:POS-SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -301,7 +299,7 @@ bs_x: deviceConfig: prefix: X10SA-ES-BS:TRX deviceTags: - - se + - se enabled: true onFailure: buffer readoutPriority: baseline @@ -313,7 +311,7 @@ bs_y: deviceConfig: prefix: X10SA-ES-BS:TRY deviceTags: - - se + - se enabled: true onFailure: buffer readoutPriority: baseline @@ -325,7 +323,7 @@ bs_z: deviceConfig: prefix: X10SA-ES-BS:TRZ deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -343,7 +341,7 @@ bsf_f1_y: deviceConfig: prefix: X10SA-OP-BSFFI1:TRY deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -353,7 +351,7 @@ bsf_f2_y: deviceConfig: prefix: X10SA-OP-BSFFI2:TRY deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -363,7 +361,7 @@ bsf_sl_xcen: deviceConfig: prefix: X10SA-OP-BSFSLH:CENTER deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -373,7 +371,7 @@ bsf_sl_xr: deviceConfig: prefix: X10SA-OP-BSFSLH:TRXR deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -383,7 +381,7 @@ bsf_sl_xsize: deviceConfig: prefix: X10SA-OP-BSFSLH:SIZE deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -393,7 +391,7 @@ bsf_sl_xw: deviceConfig: prefix: X10SA-OP-BSFSLH:TRXW deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -403,7 +401,7 @@ bsf_sl_yb: deviceConfig: prefix: X10SA-OP-BSFSLV:TRYB deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -413,7 +411,7 @@ bsf_sl_ycen: deviceConfig: prefix: X10SA-OP-BSFSLV:CENTER deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -423,7 +421,7 @@ bsf_sl_ysize: deviceConfig: prefix: X10SA-OP-BSFSLV:SIZE deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -433,7 +431,7 @@ bsf_sl_yt: deviceConfig: prefix: X10SA-OP-BSFSLV:TRYT deviceTags: - - bsf + - bsf enabled: true onFailure: buffer readoutPriority: baseline @@ -443,7 +441,7 @@ coll_x: deviceConfig: prefix: X10SA-ES-COL:TRX deviceTags: - - se + - se enabled: true onFailure: buffer readoutPriority: baseline @@ -455,7 +453,7 @@ coll_y: deviceConfig: prefix: X10SA-ES-COL:TRY deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -473,7 +471,7 @@ coll_y_in_position: auto_monitor: true read_pv: X10SA-ES-COL:POS-SET-SEQ.DO2 deviceTags: - - se + - se enabled: true onFailure: buffer readoutPriority: baseline @@ -484,7 +482,7 @@ cryo_pos: auto_monitor: true read_pv: X10SA-ES-CS:POS-SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -499,7 +497,7 @@ cryo_temp: auto_monitor: true read_pv: X10SA-ES-CS:TEMP_RBV deviceTags: - - se + - se enabled: true onFailure: buffer readOnly: true @@ -510,7 +508,7 @@ cryo_x: deviceConfig: prefix: X10SA-ES-CS:TRX deviceTags: - - se + - se enabled: true onFailure: buffer readoutPriority: baseline @@ -520,7 +518,7 @@ dcm_bragg: deviceConfig: prefix: X10SA-OP-DCM:ROTY deviceTags: - - dcm + - dcm enabled: true onFailure: buffer readoutPriority: baseline @@ -530,7 +528,7 @@ dcm_fpitch: deviceConfig: prefix: X10SA-OP-DCM:ROTY-CR2-FINEPITCH deviceTags: - - dcm + - dcm enabled: true onFailure: buffer readoutPriority: baseline @@ -540,7 +538,7 @@ dcm_froll: deviceConfig: prefix: X10SA-OP-DCM:ROTZ-CR2-FINEROLL deviceTags: - - dcm + - dcm enabled: true onFailure: buffer readoutPriority: baseline @@ -550,7 +548,7 @@ dcm_perp: deviceConfig: prefix: X10SA-OP-DCM:TRX-CR2 deviceTags: - - dcm + - dcm enabled: true onFailure: buffer readoutPriority: baseline @@ -560,7 +558,7 @@ dcm_pitch: deviceConfig: prefix: X10SA-OP-DCM:ROTY-CR2-PITCH deviceTags: - - dcm + - dcm enabled: true onFailure: buffer readoutPriority: baseline @@ -572,7 +570,7 @@ dcm_x: deviceConfig: prefix: X10SA-OP-DCM:TRX deviceTags: - - dcm + - dcm enabled: true onFailure: buffer readoutPriority: baseline @@ -583,7 +581,7 @@ det_cov: auto_monitor: true read_pv: X10SA-ES-DETCOV:SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -597,7 +595,7 @@ det_xi_focus: deviceConfig: prefix: X10SA-ES-XEYE:FOCUS deviceTags: - - det + - det enabled: true onFailure: buffer readoutPriority: baseline @@ -607,7 +605,7 @@ det_xi_x: deviceConfig: prefix: X10SA-ES-XEYE:TRX deviceTags: - - det + - det enabled: true onFailure: buffer readoutPriority: baseline @@ -617,7 +615,7 @@ det_xi_zoom: deviceConfig: prefix: X10SA-ES-XEYE:ZOOM deviceTags: - - det + - det enabled: true onFailure: buffer readoutPriority: baseline @@ -627,7 +625,7 @@ det_y: deviceConfig: prefix: X10SA-ES-DET:TRY deviceTags: - - det + - det enabled: true onFailure: buffer readoutPriority: baseline @@ -640,7 +638,7 @@ det_z: deviceConfig: prefix: X10SA-ES-DET:TRZ deviceTags: - - det + - det enabled: true onFailure: buffer readoutPriority: baseline @@ -653,7 +651,7 @@ diag_y: deviceConfig: prefix: X10SA-ES-SCL:TRY deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline @@ -670,7 +668,7 @@ diag_z: deviceConfig: prefix: X10SA-ES-SCL:TRZ deviceTags: - - se + - se enabled: true onFailure: buffer readoutPriority: baseline @@ -681,7 +679,7 @@ fe_bpm1: auto_monitor: true read_pv: X10SA-FE-XBPM1:Current1:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -693,7 +691,7 @@ fe_bpm2: auto_monitor: true read_pv: X10SA-FE-XBPM1:Current2:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -705,7 +703,7 @@ fe_bpm3: auto_monitor: true read_pv: X10SA-FE-XBPM1:Current3:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -717,7 +715,7 @@ fe_bpm4: auto_monitor: true read_pv: X10SA-FE-XBPM1:Current4:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -728,7 +726,7 @@ fe_bpm_x: deviceConfig: prefix: X10SA-FE-XBPM1:TRX deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -738,7 +736,7 @@ fe_bpm_y: deviceConfig: prefix: X10SA-FE-XBPM1:TRY deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -749,7 +747,7 @@ fe_bpmsum: auto_monitor: true read_pv: X10SA-FE-XBPM1:SumAll:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -760,7 +758,7 @@ fe_sl_xcen: deviceConfig: prefix: X10SA-FE-SL1:CENTERX deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -770,7 +768,7 @@ fe_sl_xr: deviceConfig: prefix: X10SA-FE-SL1:TRXR deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -780,7 +778,7 @@ fe_sl_xsize: deviceConfig: prefix: X10SA-FE-SL1:SIZEX deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -790,7 +788,7 @@ fe_sl_xw: deviceConfig: prefix: X10SA-FE-SL1:TRXW deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -800,7 +798,7 @@ fe_sl_yb: deviceConfig: prefix: X10SA-FE-SL1:TRYB deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -810,7 +808,7 @@ fe_sl_ycen: deviceConfig: prefix: X10SA-FE-SL1:CENTERY deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -820,7 +818,7 @@ fe_sl_ysize: deviceConfig: prefix: X10SA-FE-SL1:SIZEY deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -830,7 +828,7 @@ fe_sl_yt: deviceConfig: prefix: X10SA-FE-SL1:TRYT deviceTags: - - fe + - fe enabled: true onFailure: buffer readoutPriority: baseline @@ -841,13 +839,13 @@ fl_bright: auto_monitor: true read_pv: X10SA-ES-FL:SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline userParameter: - 'off': 0.0 - 'on': 3.0 + "off": 0.0 + "on": 3.0 tol: 0.01 type: continuous hfm_bd: @@ -856,7 +854,7 @@ hfm_bd: deviceConfig: prefix: X10SA-ES-HFM:BNDD deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -866,7 +864,7 @@ hfm_bu: deviceConfig: prefix: X10SA-ES-HFM:BNDU deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -876,7 +874,7 @@ hfm_pitch: deviceConfig: prefix: X10SA-ES-HFM:PITCH deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -886,7 +884,7 @@ hfm_roll: deviceConfig: prefix: X10SA-ES-HFM:ROLL deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -896,7 +894,7 @@ hfm_x: deviceConfig: prefix: X10SA-ES-HFM:TRX deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -906,7 +904,7 @@ hfm_xd: deviceConfig: prefix: X10SA-ES-HFM:TRXD deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -916,7 +914,7 @@ hfm_xu: deviceConfig: prefix: X10SA-ES-HFM:TRXU deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -926,7 +924,7 @@ hfm_y: deviceConfig: prefix: X10SA-ES-HFM:TRY deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -936,7 +934,7 @@ hfm_yaw: deviceConfig: prefix: X10SA-ES-HFM:YAW deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -946,7 +944,7 @@ hfm_ydw: deviceConfig: prefix: X10SA-ES-HFM:TRYDW deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -956,7 +954,7 @@ hfm_yr: deviceConfig: prefix: X10SA-ES-HFM:TRYR deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -966,7 +964,7 @@ hfm_yuw: deviceConfig: prefix: X10SA-ES-HFM:TRYUW deviceTags: - - hfm + - hfm enabled: true onFailure: buffer readoutPriority: baseline @@ -977,7 +975,7 @@ i1: auto_monitor: true read_pv: X10SA-ES-SCLDI:READOUT deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -989,7 +987,7 @@ i2: auto_monitor: true read_pv: X10SA-ES-XEYEDI:READOUT deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -998,7 +996,7 @@ id_gap: description: undulator gap deviceClass: pxii_bec.devices.undulator.UndulatorGap deviceConfig: - prefix: 'X10SA-UIND:' + prefix: "X10SA-UIND:" enabled: true onFailure: buffer readoutPriority: baseline @@ -1009,7 +1007,7 @@ lu_bpm1: auto_monitor: true read_pv: X10SA-OP-LUBPM:Current1:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1021,7 +1019,7 @@ lu_bpm2: auto_monitor: true read_pv: X10SA-OP-LUBPM:Current2:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1033,7 +1031,7 @@ lu_bpm3: auto_monitor: true read_pv: X10SA-OP-LUBPM:Current3:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1045,7 +1043,7 @@ lu_bpm4: auto_monitor: true read_pv: X10SA-OP-LUBPM:Current4:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1056,7 +1054,7 @@ lu_bpm_x: deviceConfig: prefix: X10SA-OP-LUBPM:TRX deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1066,7 +1064,7 @@ lu_bpm_y: deviceConfig: prefix: X10SA-OP-LUBPM:TRY deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1077,7 +1075,7 @@ lu_bpmsum: auto_monitor: true read_pv: X10SA-OP-LUBPM:SumAll:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1088,7 +1086,7 @@ lu_pod1_rotx: deviceConfig: prefix: X10SA-OP-LUPOD1:ROTX deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1098,7 +1096,7 @@ lu_pod1_roty: deviceConfig: prefix: X10SA-OP-LUPOD1:ROTY deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1108,7 +1106,7 @@ lu_pod1_rotz: deviceConfig: prefix: X10SA-OP-LUPOD1:ROTZ deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1118,7 +1116,7 @@ lu_pod1_y: deviceConfig: prefix: X10SA-OP-LUPOD1:TRY deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1128,7 +1126,7 @@ lu_pod1_z: deviceConfig: prefix: X10SA-OP-LUPOD1:TRZ deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1138,7 +1136,7 @@ lu_pod2_rotx: deviceConfig: prefix: X10SA-OP-LUPOD2:ROTX deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1148,7 +1146,7 @@ lu_pod2_roty: deviceConfig: prefix: X10SA-OP-LUPOD2:ROTY deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1158,7 +1156,7 @@ lu_pod2_rotz: deviceConfig: prefix: X10SA-OP-LUPOD2:ROTZ deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1168,7 +1166,7 @@ lu_pod2_y: deviceConfig: prefix: X10SA-OP-LUPOD2:TRY deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1178,7 +1176,7 @@ lu_pod2_z: deviceConfig: prefix: X10SA-OP-LUPOD2:TRZ deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1188,7 +1186,7 @@ lu_z1: deviceConfig: prefix: X10SA-OP-LUTRZ1:TRZ deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1198,7 +1196,7 @@ lu_z2: deviceConfig: prefix: X10SA-OP-LUTRZ2:TRZ deviceTags: - - lu + - lu enabled: true onFailure: buffer readoutPriority: baseline @@ -1209,7 +1207,7 @@ mag_ok: auto_monitor: true read_pv: X10SA-ES-DFS:CBOX-CMP1 deviceTags: - - se + - se enabled: true onFailure: buffer readOnly: true @@ -1221,7 +1219,7 @@ mag_rbv: auto_monitor: true read_pv: X10SA-ES-DFS:CBOX-USER1 deviceTags: - - se + - se enabled: true onFailure: buffer readOnly: true @@ -1233,7 +1231,7 @@ mag_ref: auto_monitor: true read_pv: X10SA-ES-DFS:CBOX-REFVAL1 deviceTags: - - se + - se enabled: true onFailure: buffer readOnly: true @@ -1242,7 +1240,7 @@ microscope_stats: description: Stats Signal of MS camera deviceClass: pxii_bec.devices.stats_signal.StatsSignal deviceConfig: - prefix: 'X10SA-ES-MS:' + prefix: "X10SA-ES-MS:" enabled: true readoutPriority: async softwareTrigger: true @@ -1253,7 +1251,7 @@ samcam_ecc: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:Eccentricity_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1265,7 +1263,7 @@ samcam_exp: auto_monitor: true read_pv: X10SA-ES-MS:cam1:AcquireTime deviceTags: - - scam + - scam enabled: true onFailure: buffer readoutPriority: baseline @@ -1276,7 +1274,7 @@ samcam_gain: auto_monitor: true read_pv: X10SA-ES-MS:cam1:Gain deviceTags: - - scam + - scam enabled: true onFailure: buffer readoutPriority: baseline @@ -1287,7 +1285,7 @@ samcam_max: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:MaxValue_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1299,7 +1297,7 @@ samcam_mean: auto_monitor: true read_pv: X10SA-ES-MS:Stats1:MeanValue_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1311,7 +1309,7 @@ samcam_sigma: auto_monitor: true read_pv: X10SA-ES-MS:Stats1:Sigma_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1323,7 +1321,7 @@ samcam_thresh: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:CentroidThreshold deviceTags: - - scam + - scam enabled: true onFailure: buffer readoutPriority: baseline @@ -1334,7 +1332,7 @@ samcam_x: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:CentroidX_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1346,7 +1344,7 @@ samcam_xcurs: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:CursorX deviceTags: - - scam + - scam enabled: true onFailure: buffer readoutPriority: baseline @@ -1357,7 +1355,7 @@ samcam_xcursprof: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:ProfileCursorX_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1369,7 +1367,7 @@ samcam_xsig: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:SigmaX_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1381,7 +1379,7 @@ samcam_y: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:CentroidY_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1393,7 +1391,7 @@ samcam_ycursprof: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:ProfileCursorY_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1405,7 +1403,7 @@ samcam_ysig: auto_monitor: true read_pv: X10SA-ES-MS:Stats5:SigmaY_RBV deviceTags: - - scam + - scam enabled: true onFailure: buffer readOnly: true @@ -1414,9 +1412,9 @@ scam: description: Sample camera image contrast deviceClass: pxii_bec.devices.contrast.CameraContrast deviceConfig: - prefix: 'X10SA-ES-MS:Stats1:' + prefix: "X10SA-ES-MS:Stats1:" deviceTags: - - detector + - detector enabled: true readOnly: true readoutPriority: monitored @@ -1426,7 +1424,7 @@ scam_zoom: deviceConfig: prefix: X10SA-ES-MS:ZOOM deviceTags: - - scam + - scam enabled: true onFailure: buffer readoutPriority: baseline @@ -1437,7 +1435,7 @@ sls_current: auto_monitor: true read_pv: ARS07-DPCT-0100:CURR deviceTags: - - SLS + - SLS enabled: true onFailure: buffer readOnly: true @@ -1448,8 +1446,8 @@ smargon: deviceConfig: prefix: http://x10sa-smargopolo.psi.ch:3000 deviceTags: - - motors - - smargon + - motors + - smargon enabled: true onFailure: buffer readoutPriority: baseline @@ -1471,7 +1469,7 @@ ss_bpm1: auto_monitor: true read_pv: X10SA-ES-SSBPM:Current1:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1483,7 +1481,7 @@ ss_bpm2: auto_monitor: true read_pv: X10SA-ES-SSBPM:Current2:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1495,7 +1493,7 @@ ss_bpm3: auto_monitor: true read_pv: X10SA-ES-SSBPM:Current3:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1507,7 +1505,7 @@ ss_bpm4: auto_monitor: true read_pv: X10SA-ES-SSBPM:Current4:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1518,7 +1516,7 @@ ss_bpm_x: deviceConfig: prefix: X10SA-ES-SSBPM:TRX deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1528,7 +1526,7 @@ ss_bpm_y: deviceConfig: prefix: X10SA-ES-SSBPM:TRY deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1539,7 +1537,7 @@ ss_bpmsum: auto_monitor: true read_pv: X10SA-ES-SSBPM:SumAll:MeanValue_RBV deviceTags: - - bpm + - bpm enabled: true onFailure: buffer readOnly: true @@ -1550,7 +1548,7 @@ ss_f1_x: deviceConfig: prefix: X10SA-ES-SSFI1:TRX deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1560,7 +1558,7 @@ ss_f2_x: deviceConfig: prefix: X10SA-ES-SSFI2:TRX deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1570,7 +1568,7 @@ ss_f3_x: deviceConfig: prefix: X10SA-ES-SSFI3:TRX deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1580,7 +1578,7 @@ ss_f4_x: deviceConfig: prefix: X10SA-ES-SSFI4:TRX deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1590,7 +1588,7 @@ ss_sl_xcen: deviceConfig: prefix: X10SA-ES-SSSLH:CENTER deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1600,7 +1598,7 @@ ss_sl_xr: deviceConfig: prefix: X10SA-ES-SSSLH:TRXR deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1610,7 +1608,7 @@ ss_sl_xsize: deviceConfig: prefix: X10SA-ES-SSSLH:SIZE deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1620,7 +1618,7 @@ ss_sl_xw: deviceConfig: prefix: X10SA-ES-SSSLH:TRXW deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1630,7 +1628,7 @@ ss_sl_yb: deviceConfig: prefix: X10SA-ES-SSSLV:TRYB deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1640,7 +1638,7 @@ ss_sl_ycen: deviceConfig: prefix: X10SA-ES-SSSLV:CENTER deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1650,7 +1648,7 @@ ss_sl_ysize: deviceConfig: prefix: X10SA-ES-SSSLV:SIZE deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1660,7 +1658,7 @@ ss_sl_yt: deviceConfig: prefix: X10SA-ES-SSSLV:TRYT deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1670,7 +1668,7 @@ ss_xi_x: deviceConfig: prefix: X10SA-ES-SSXI:TRX deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1684,7 +1682,7 @@ ss_xi_y: deviceConfig: prefix: X10SA-ES-SSXI:TRY deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1695,7 +1693,7 @@ ss_xicam_exp: auto_monitor: true read_pv: X10SA-ES-SSCAM:cam1:AcquireTime deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1706,7 +1704,7 @@ ss_xicam_gain: auto_monitor: true read_pv: X10SA-ES-SSCAM:cam1:Gain deviceTags: - - ss + - ss enabled: true onFailure: buffer readoutPriority: baseline @@ -1717,7 +1715,7 @@ ss_xicam_max: auto_monitor: true read_pv: X10SA-ES-SSCAM:Stats5:MaxValue_RBV deviceTags: - - ss + - ss enabled: true onFailure: buffer readOnly: true @@ -1729,7 +1727,7 @@ ss_xicam_x: auto_monitor: true read_pv: X10SA-ES-SSCAM:Stats5:CentroidX_RBV deviceTags: - - ss + - ss enabled: true onFailure: buffer readOnly: true @@ -1741,7 +1739,7 @@ ss_xicam_xsig: auto_monitor: true read_pv: X10SA-ES-SSCAM:Stats5:SigmaX_RBV deviceTags: - - ss + - ss enabled: true onFailure: buffer readOnly: true @@ -1753,7 +1751,7 @@ ss_xicam_y: auto_monitor: true read_pv: X10SA-ES-SSCAM:Stats5:CentroidY_RBV deviceTags: - - ss + - ss enabled: true onFailure: buffer readOnly: true @@ -1765,7 +1763,7 @@ ss_xicam_ysig: auto_monitor: true read_pv: X10SA-ES-SSCAM:Stats5:SigmaY_RBV deviceTags: - - ss + - ss enabled: true onFailure: buffer readOnly: true @@ -1776,7 +1774,7 @@ transm: deviceConfig: read_pv: X10SA-ES-SSFI:TRANSM-SET deviceTags: - - transm + - transm enabled: true readoutPriority: baseline vfm_bd: @@ -1785,7 +1783,7 @@ vfm_bd: deviceConfig: prefix: X10SA-ES-VFM:BNDD deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1795,7 +1793,7 @@ vfm_bu: deviceConfig: prefix: X10SA-ES-VFM:BNDU deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1805,7 +1803,7 @@ vfm_pitch: deviceConfig: prefix: X10SA-ES-VFM:PITCH deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1815,7 +1813,7 @@ vfm_roll: deviceConfig: prefix: X10SA-ES-VFM:ROLL deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1825,7 +1823,7 @@ vfm_x: deviceConfig: prefix: X10SA-ES-VFM:TRX deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1835,7 +1833,7 @@ vfm_xd: deviceConfig: prefix: X10SA-ES-VFM:TRXD deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1845,7 +1843,7 @@ vfm_xu: deviceConfig: prefix: X10SA-ES-VFM:TRXU deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1855,7 +1853,7 @@ vfm_y: deviceConfig: prefix: X10SA-ES-VFM:TRY deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1865,7 +1863,7 @@ vfm_yaw: deviceConfig: prefix: X10SA-ES-VFM:YAW deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1875,7 +1873,7 @@ vfm_ydr: deviceConfig: prefix: X10SA-ES-VFM:TRYDR deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1885,7 +1883,7 @@ vfm_yur: deviceConfig: prefix: X10SA-ES-VFM:TRYUR deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1895,7 +1893,7 @@ vfm_yw: deviceConfig: prefix: X10SA-ES-VFM:TRYW deviceTags: - - vfm + - vfm enabled: true onFailure: buffer readoutPriority: baseline @@ -1905,7 +1903,7 @@ xi_focus: deviceConfig: prefix: X10SA-ES-XEYE:FOCUS deviceTags: - - xeye + - xeye enabled: true onFailure: buffer readoutPriority: baseline @@ -1915,7 +1913,7 @@ xi_x: deviceConfig: prefix: X10SA-ES-XEYE:TRX deviceTags: - - xeye + - xeye enabled: true onFailure: buffer readoutPriority: baseline @@ -1925,7 +1923,7 @@ xi_zoom: deviceConfig: prefix: X10SA-ES-XEYE:ZOOM deviceTags: - - xeye + - xeye enabled: true onFailure: buffer readoutPriority: baseline @@ -1936,7 +1934,7 @@ xidiode: auto_monitor: true read_pv: X10SA-ES-XEYEDI:READOUT deviceTags: - - xeye + - xeye enabled: true onFailure: buffer readOnly: true @@ -1948,7 +1946,7 @@ xrf_pos: auto_monitor: true read_pv: X10SA-ES-XRF:POS-SET deviceTags: - - state + - state enabled: true onFailure: buffer readoutPriority: baseline diff --git a/pxii_bec/scripts/init_beamline.py b/pxii_bec/scripts/init_beamline.py index 39e25d7..57549fc 100755 --- a/pxii_bec/scripts/init_beamline.py +++ b/pxii_bec/scripts/init_beamline.py @@ -1,10 +1,15 @@ """Initialise sample environment devices and beamline states.""" -import os import importlib +import os from dataclasses import dataclass from pathlib import Path +from pxii_bec.macros.beamline_planner import StateChangePlanner +from pxii_bec.macros.beamline_state_manager import DefineStatesManager +from pxii_bec.macros.dependencies import planner_deps +from pxii_bec.macros.devices_manager import DeviceManager + @dataclass class Environment: @@ -39,7 +44,7 @@ class Environment: if self.beamline not in self.beamline_configs: raise ValueError( - f"Unknown beamline '{self.beamline}'. " f"Choose from {list(self.beamline_configs)}" + f"Unknown beamline '{self.beamline}'. Choose from {list(self.beamline_configs)}" ) cfg = self.beamline_configs[self.beamline] diff --git a/pyproject.toml b/pyproject.toml index b5d968d..fd7e7a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,10 +60,10 @@ plugin_widgets_update = "pxii_bec.bec_widgets.auto_updates" plugin_widgets = "pxii_bec.bec_widgets.widgets" [project.entry-points."bec.messages"] -plugin_scans = "pxii_bec.messages" +plugin_messages = "pxii_bec.messages" [project.entry-points."bec.bl_states"] -plugin_scans = "pxii_bec.states" +plugin_bl_states = "pxii_bec.states" [tool.hatch.build.targets.wheel] include = ["*"]