Merge branch 'xtreme_devices_update' into 'master'

fix: fixed pv name for sample manipulator

See merge request bec/ophyd_devices!20
This commit is contained in:
wakonig_k 2023-05-09 16:50:48 +00:00
commit 4c7b9c0c0b

View File

@ -105,7 +105,7 @@ signals:
sample_hor: sample_hor:
description: 'Horizontal sample position' description: 'Horizontal sample position'
deviceClass: EpicsMotor deviceClass: EpicsMotor
deviceConfig: {name: sample_hor, prefix: 'X07MA-ES1-AI:TRZS'} deviceConfig: {name: sample_hor, prefix: 'X07MA-ES1-MAG:TRZS'}
acquisitionConfig: {acquisitionGroup: monitor, readoutPriority: baseline, schedule: sync} acquisitionConfig: {acquisitionGroup: monitor, readoutPriority: baseline, schedule: sync}
onFailure: retry onFailure: retry
status: {enabled: true} status: {enabled: true}
@ -113,7 +113,7 @@ sample_hor:
sample_vert: sample_vert:
description: 'Horizontal sample position' description: 'Horizontal sample position'
deviceClass: EpicsMotor deviceClass: EpicsMotor
deviceConfig: {name: sample_vert, prefix: 'X07MA-ES1-AI:TRY1'} deviceConfig: {name: sample_vert, prefix: 'X07MA-ES1-MAG:TRY1'}
acquisitionConfig: {acquisitionGroup: monitor, readoutPriority: baseline, schedule: sync} acquisitionConfig: {acquisitionGroup: monitor, readoutPriority: baseline, schedule: sync}
onFailure: retry onFailure: retry
status: {enabled: true} status: {enabled: true}
@ -121,7 +121,7 @@ sample_vert:
sample_rot: sample_rot:
description: 'Horizontal sample position' description: 'Horizontal sample position'
deviceClass: EpicsMotor deviceClass: EpicsMotor
deviceConfig: {name: sample_rot, prefix: 'X07MA-ES1-AI:ROY1'} deviceConfig: {name: sample_rot, prefix: 'X07MA-ES1-MAG:ROY1'}
acquisitionConfig: {acquisitionGroup: monitor, readoutPriority: baseline, schedule: sync} acquisitionConfig: {acquisitionGroup: monitor, readoutPriority: baseline, schedule: sync}
onFailure: retry onFailure: retry
status: {enabled: true} status: {enabled: true}