From bdd7f1767fb06d2b9f55a54c1ab544b7836ca90e Mon Sep 17 00:00:00 2001 From: x12sa Date: Mon, 1 Dec 2025 18:04:06 +0100 Subject: [PATCH 1/3] new yaml file sastt for sastt setup --- csaxs_bec/device_configs/sastt.yaml | 78 +++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 csaxs_bec/device_configs/sastt.yaml diff --git a/csaxs_bec/device_configs/sastt.yaml b/csaxs_bec/device_configs/sastt.yaml new file mode 100644 index 0000000..f5fedfe --- /dev/null +++ b/csaxs_bec/device_configs/sastt.yaml @@ -0,0 +1,78 @@ +samx: + description: Owis motor stage samx + deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceConfig: + prefix: X12SA-ES2-ES01 + motor_resolution: 0.00125 + base_velocity: 0.0625 + velocity: 10 + backlash_distance: 0.125 + acceleration: 0.2 + user_offset_dir: 1 + deviceTags: + - cSAXS + - owis_samx + onFailure: buffer + enabled: true + readoutPriority: baseline + softwareTrigger: false +samy: + description: Owis motor stage samy + deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceConfig: + prefix: X12SA-ES2-ES02 + motor_resolution: 0.00125 + base_velocity: 0.0625 + velocity: 10 + backlash_distance: 0.125 + acceleration: 0.2 + user_offset_dir: 0 + deviceTags: + - cSAXS + - owis_samx + onFailure: buffer + enabled: true + readoutPriority: baseline + softwareTrigger: false +rotx: + description: Rotation stage rotx + deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceConfig: + prefix: X12SA-ES2-ES03 + motor_resolution: 0.0025 + base_velocity: 0.5 + velocity: 7.5 + backlash_distance: 0.25 + acceleration: 0.2 + user_offset_dir: 1 + limits: + - -0.1 + - 0.1 + deviceTags: + - cSAXS + - rotx + onFailure: buffer + enabled: true + readoutPriority: baseline + softwareTrigger: false +roty: + description: Rotation stage roty + deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceConfig: + prefix: X12SA-ES2-ES04 + motor_resolution: 0.0025 + base_velocity: 0.5 + velocity: 7.5 + backlash_distance: 0.25 + acceleration: 0.2 + user_offset_dir: 1 + limits: + - -0.1 + - 0.1 + deviceTags: + - cSAXS + - roty + onFailure: buffer + enabled: true + readoutPriority: baseline + softwareTrigger: false \ No newline at end of file -- 2.49.1 From dbab981ac2477a5f381b949f308185c3da11f200 Mon Sep 17 00:00:00 2001 From: x12sa Date: Tue, 9 Dec 2025 07:34:13 +0100 Subject: [PATCH 2/3] add micfoc and change some motor settings --- csaxs_bec/device_configs/sastt.yaml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/csaxs_bec/device_configs/sastt.yaml b/csaxs_bec/device_configs/sastt.yaml index f5fedfe..b1caaee 100644 --- a/csaxs_bec/device_configs/sastt.yaml +++ b/csaxs_bec/device_configs/sastt.yaml @@ -65,7 +65,7 @@ roty: velocity: 7.5 backlash_distance: 0.25 acceleration: 0.2 - user_offset_dir: 1 + user_offset_dir: 0 limits: - -0.1 - 0.1 @@ -75,4 +75,22 @@ roty: onFailure: buffer enabled: true readoutPriority: baseline - softwareTrigger: false \ No newline at end of file + softwareTrigger: false +micfoc: + description: Focusing motor of Microscope stage + deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceConfig: + prefix: X12SA-ES2-ES05 + motor_resolution: 0.00125 + base_velocity: 0.25 + velocity: 2.5 + backlash_distance: 0.125 + acceleration: 0.4 + user_offset_dir: 0 + deviceTags: + - cSAXS + - micfoc + onFailure: buffer + enabled: true + readoutPriority: baseline + softwareTrigger: false -- 2.49.1 From d99b44b619f55b5ad43784a7735775e4bef93055 Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 11 Dec 2025 07:50:10 +0100 Subject: [PATCH 3/3] refactor(configs):Migrate deviceClass for EpicsMotorEX to EpicsUserMotorVME --- csaxs_bec/device_configs/bec_device_config_sastt.yaml | 10 +++++----- csaxs_bec/device_configs/sastt.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/csaxs_bec/device_configs/bec_device_config_sastt.yaml b/csaxs_bec/device_configs/bec_device_config_sastt.yaml index cb75637..058b125 100644 --- a/csaxs_bec/device_configs/bec_device_config_sastt.yaml +++ b/csaxs_bec/device_configs/bec_device_config_sastt.yaml @@ -115,7 +115,7 @@ samy: softwareTrigger: false micfoc: description: Focusing motor of Microscope stage - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES06 motor_resolution: 0.00125 @@ -133,7 +133,7 @@ micfoc: softwareTrigger: false owis_samx: description: Owis motor stage samx - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES01 motor_resolution: 0.00125 @@ -151,7 +151,7 @@ owis_samx: softwareTrigger: false owis_samy: description: Owis motor stage samx - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES02 motor_resolution: 0.00125 @@ -169,7 +169,7 @@ owis_samy: softwareTrigger: false rotx: description: Rotation stage rotx - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES05 motor_resolution: 0.0025 @@ -190,7 +190,7 @@ rotx: softwareTrigger: false roty: description: Rotation stage rotx - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES04 motor_resolution: 0.0025 diff --git a/csaxs_bec/device_configs/sastt.yaml b/csaxs_bec/device_configs/sastt.yaml index b1caaee..5493676 100644 --- a/csaxs_bec/device_configs/sastt.yaml +++ b/csaxs_bec/device_configs/sastt.yaml @@ -1,6 +1,6 @@ samx: description: Owis motor stage samx - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES01 motor_resolution: 0.00125 @@ -18,7 +18,7 @@ samx: softwareTrigger: false samy: description: Owis motor stage samy - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES02 motor_resolution: 0.00125 @@ -36,7 +36,7 @@ samy: softwareTrigger: false rotx: description: Rotation stage rotx - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES03 motor_resolution: 0.0025 @@ -57,7 +57,7 @@ rotx: softwareTrigger: false roty: description: Rotation stage roty - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES04 motor_resolution: 0.0025 @@ -78,7 +78,7 @@ roty: softwareTrigger: false micfoc: description: Focusing motor of Microscope stage - deviceClass: ophyd_devices.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME deviceConfig: prefix: X12SA-ES2-ES05 motor_resolution: 0.00125 -- 2.49.1