diff --git a/csaxs_bec/device_configs/bl_endstation.yaml b/csaxs_bec/device_configs/bl_endstation.yaml index 5aa5025..3347e25 100644 --- a/csaxs_bec/device_configs/bl_endstation.yaml +++ b/csaxs_bec/device_configs/bl_endstation.yaml @@ -60,6 +60,7 @@ xbpm3x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -22.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -82,6 +83,7 @@ xbpm3y: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -2 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -104,6 +106,7 @@ sl3trxi: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -126,6 +129,7 @@ sl3trxo: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -148,6 +152,7 @@ sl3trxb: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -5.8 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -170,6 +175,7 @@ sl3trxt: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -192,6 +198,7 @@ fast_shutter_n1_x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -7 in: 0 @@ -215,6 +222,7 @@ fast_shutter_o1_x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -15.8 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -237,6 +245,7 @@ fast_shutter_o2_x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -15.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -259,6 +268,7 @@ filter_array_1_x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 25 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -281,6 +291,7 @@ filter_array_2_x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 25.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -303,6 +314,7 @@ filter_array_3_x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 25.8 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -325,6 +337,7 @@ filter_array_4_x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 25 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -347,6 +360,7 @@ sl4trxi: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -369,6 +383,7 @@ sl4trxo: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -391,6 +406,7 @@ sl4trxb: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -5.8 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -413,6 +429,7 @@ sl4trxt: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -437,6 +454,7 @@ sl5trxi: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -459,6 +477,7 @@ sl5trxo: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -481,6 +500,7 @@ sl5trxb: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -5.5 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -503,6 +523,7 @@ sl5trxt: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 6 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -525,6 +546,7 @@ xbimtrx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: -14.7 # bl_smar_stage to use csaxs reference method. assign number according to axis channel @@ -547,6 +569,7 @@ xbimtry: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: init_position: 0 # bl_smar_stage to use csaxs reference method. assign number according to axis channel diff --git a/csaxs_bec/device_configs/bl_optics_hutch.yaml b/csaxs_bec/device_configs/bl_optics_hutch.yaml index 7ce2815..5dcf9f9 100644 --- a/csaxs_bec/device_configs/bl_optics_hutch.yaml +++ b/csaxs_bec/device_configs/bl_optics_hutch.yaml @@ -89,6 +89,7 @@ xbpm2x: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 0 @@ -108,6 +109,7 @@ xbpm2y: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 1 @@ -127,6 +129,7 @@ cu_foilx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 2 @@ -146,6 +149,7 @@ scinx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: # bl_smar_stage to use csaxs reference method. assign number according to axis channel bl_smar_stage: 3 diff --git a/csaxs_bec/device_configs/ptycho_flomni.yaml b/csaxs_bec/device_configs/ptycho_flomni.yaml index db60cfd..7ca30d6 100644 --- a/csaxs_bec/device_configs/ptycho_flomni.yaml +++ b/csaxs_bec/device_configs/ptycho_flomni.yaml @@ -17,6 +17,7 @@ feyex: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -16.267 out: -1 @@ -35,6 +36,7 @@ feyey: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -10.467 fheater: @@ -52,6 +54,7 @@ fheater: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 foptx: description: Optics X deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -67,6 +70,7 @@ foptx: onFailure: buffer readOnly: true readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -13.761 fopty: @@ -84,6 +88,7 @@ fopty: onFailure: buffer readOnly: true readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0.552 out: 0.752 @@ -102,6 +107,7 @@ foptz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 23 fsamroy: @@ -119,6 +125,7 @@ fsamroy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 fsamx: description: Sample coarse X deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -134,6 +141,7 @@ fsamx: onFailure: buffer readOnly: true readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -1.1 fsamy: @@ -150,7 +158,8 @@ fsamy: enabled: true onFailure: buffer readOnly: true - readoutPriority: baseline + readoutPriority: baseline' + connectionTimeout: 20 userParameter: in: 2.75 ftracky: @@ -168,6 +177,7 @@ ftracky: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 ftrackz: description: Laser Tracker coarse Z deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -183,6 +193,7 @@ ftrackz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 ftransx: description: Sample transer X deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -198,6 +209,7 @@ ftransx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 ftransy: description: Sample transer Y deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -213,6 +225,7 @@ ftransy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: sensor_voltage: -2.4 ftransz: @@ -230,6 +243,7 @@ ftransz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 ftray: description: Sample transfer tray deviceClass: csaxs_bec.devices.omny.galil.fgalil_ophyd.FlomniGalilMotor @@ -245,6 +259,7 @@ ftray: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 ############################################################ @@ -279,6 +294,7 @@ fosax: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 9.124 out: 5.3 @@ -297,6 +313,7 @@ fosay: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0.367 fosaz: @@ -314,6 +331,7 @@ fosaz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 8.5 out: 6 @@ -334,6 +352,7 @@ rtx: onFailure: buffer readOnly: false readoutPriority: on_request + connectionTimeout: 20 userParameter: low_signal: 10000 min_signal: 9000 @@ -350,6 +369,7 @@ rty: onFailure: buffer readOnly: false readoutPriority: on_request + connectionTimeout: 20 userParameter: tomo_additional_offsety: 0 rtz: @@ -364,6 +384,7 @@ rtz: onFailure: buffer readOnly: false readoutPriority: on_request + connectionTimeout: 20 ############################################################ ####################### Cameras ############################ diff --git a/csaxs_bec/device_configs/ptycho_lamni.yaml b/csaxs_bec/device_configs/ptycho_lamni.yaml index cb9bcd1..cd3c250 100644 --- a/csaxs_bec/device_configs/ptycho_lamni.yaml +++ b/csaxs_bec/device_configs/ptycho_lamni.yaml @@ -19,6 +19,7 @@ leyex: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 14.117 leyey: @@ -38,6 +39,7 @@ leyey: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 48.069 out: 0.5 @@ -58,6 +60,7 @@ loptx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -0.244 out: -0.699 @@ -78,6 +81,7 @@ lopty: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 3.724 out: 3.53 @@ -98,6 +102,7 @@ loptz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 lsamrot: description: Sample rotation deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -115,6 +120,7 @@ lsamrot: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 lsamx: description: Sample coarse X deviceClass: csaxs_bec.devices.omny.galil.lgalil_ophyd.LamniGalilMotor @@ -132,6 +138,7 @@ lsamx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: center: 8.768 lsamy: @@ -151,6 +158,7 @@ lsamy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: center: 10.041 @@ -176,6 +184,7 @@ losax: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -1.442 losay: @@ -195,6 +204,7 @@ losay: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -0.171 out: 3.8 @@ -215,6 +225,7 @@ losaz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -1 out: -3 @@ -238,6 +249,7 @@ rtx: deviceTags: - lamni readoutPriority: baseline + connectionTimeout: 20 enabled: true readOnly: False rty: @@ -255,6 +267,7 @@ rty: deviceTags: - lamni readoutPriority: baseline + connectionTimeout: 20 enabled: true readOnly: False diff --git a/csaxs_bec/device_configs/ptycho_omny.yaml b/csaxs_bec/device_configs/ptycho_omny.yaml index edce1a7..cd894a1 100755 --- a/csaxs_bec/device_configs/ptycho_omny.yaml +++ b/csaxs_bec/device_configs/ptycho_omny.yaml @@ -69,6 +69,7 @@ rtx: onFailure: buffer readOnly: false readoutPriority: on_request + connectionTimeout: 20 userParameter: low_signal: 8500 min_signal: 8000 @@ -84,6 +85,7 @@ rty: onFailure: buffer readOnly: false readoutPriority: on_request + connectionTimeout: 20 userParameter: tomo_additional_offsety: 0 rtz: @@ -98,6 +100,7 @@ rtz: onFailure: buffer readOnly: false readoutPriority: on_request + connectionTimeout: 20 # ############################################################ # ##################### OMNY samples ######################### @@ -165,6 +168,7 @@ ofzpx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -0.4317 ofzpy: @@ -184,6 +188,7 @@ ofzpy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0.7944 out: 0.6377 @@ -204,6 +209,7 @@ ofzpz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 otransx: @@ -223,6 +229,7 @@ otransx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 otransy: @@ -242,6 +249,7 @@ otransy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: up_position: -1.2 gripper_sensorvoltagetarget: -2.30 @@ -262,6 +270,7 @@ otransz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 osamx: @@ -281,6 +290,7 @@ osamx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: -0.1 osamz: @@ -300,6 +310,7 @@ osamz: onFailure: buffer readOnly: true readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 oosay: @@ -319,6 +330,7 @@ oosay: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: near_field_in: 0.531 far_field_in: 0.4122 @@ -339,6 +351,7 @@ oosax: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: near_field_in: 3.2044 far_field_in: 3.022 @@ -359,6 +372,7 @@ oosaz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: near_field_in: -0.4452 far_field_in: 6.5 @@ -379,6 +393,7 @@ oparkz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 oshuttleopen: @@ -398,6 +413,7 @@ oshuttleopen: onFailure: buffer readOnly: true readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 oshuttlealign: @@ -417,6 +433,7 @@ oshuttlealign: onFailure: buffer readOnly: true readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 osamy: @@ -436,6 +453,7 @@ osamy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 otracky: @@ -455,6 +473,7 @@ otracky: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: start_pos: -4.3431 osamroy: @@ -474,6 +493,7 @@ osamroy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: in: 0 otrackz: @@ -493,6 +513,7 @@ otrackz: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: start_pos: -0.6948 oeyex: @@ -512,6 +533,7 @@ oeyex: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: xray_in: -45.7394 oeyez: @@ -531,6 +553,7 @@ oeyez: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: xray_in: -2 oeyey: @@ -550,6 +573,7 @@ oeyey: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: xray_in: 0.0229 @@ -572,6 +596,7 @@ ocsx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: nothing: 0 ocsy: @@ -589,6 +614,7 @@ ocsy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: nothing: 0 oshield: @@ -606,5 +632,6 @@ oshield: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 userParameter: nothing: 0 diff --git a/csaxs_bec/device_configs/user_template.yaml b/csaxs_bec/device_configs/user_template.yaml index 2cf6beb..689b53a 100644 --- a/csaxs_bec/device_configs/user_template.yaml +++ b/csaxs_bec/device_configs/user_template.yaml @@ -64,6 +64,7 @@ npx: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 deviceTags: - npoint npy: @@ -81,5 +82,6 @@ npy: onFailure: buffer readOnly: false readoutPriority: baseline + connectionTimeout: 20 deviceTags: - npoint \ No newline at end of file