From 3b7b56caca1d3e798c5be50aef96044963d70a71 Mon Sep 17 00:00:00 2001 From: gac-x07mb Date: Mon, 19 Aug 2024 13:10:19 +0200 Subject: [PATCH] small changes --- .../device_configs/phoenix_devices.yaml | 104 +++++++++--------- .../DefiningEpics_Channels.py | 11 ++ 2 files changed, 63 insertions(+), 52 deletions(-) rename phoenix_bec/local_scripts/Examples/{Learn_about_using_bec => Learn_about_ophyd}/DefiningEpics_Channels.py (84%) diff --git a/phoenix_bec/device_configs/phoenix_devices.yaml b/phoenix_bec/device_configs/phoenix_devices.yaml index 691c0b0..241f85a 100644 --- a/phoenix_bec/device_configs/phoenix_devices.yaml +++ b/phoenix_bec/device_configs/phoenix_devices.yaml @@ -1,73 +1,73 @@ ################################################### # -# phoenix standard devices (motors) +# phoenix standard devices (motors) # # ##################################################### # -# MOTORS ES1 +# MOTORS ES1 # -ScanX: - readoutPriority: baseline - description: 'Horizontal sample position' - deviceClass: ophyd.EpicsMotor - deviceConfig: - prefix: 'X07MB-ES-MA1:ScanX' +ScanX: + readoutPriority: baseline + description: 'Horizontal sample position' + deviceClass: ophyd.EpicsMotor + deviceConfig: + prefix: 'X07MB-ES-MA1:ScanX' deviceTags: - ES-MA1 - - phoenix_bec/device_configs/phoenix_devices.yaml - onFailure: retry - enabled: true - readOnly: false - softwareTrigger: false + - phoenix_bec/device_configs/phoenix_devices.yaml + onFailure: retry + enabled: true + readOnly: false + softwareTrigger: false -ScanY: - readoutPriority: baseline - description: 'Horizontal sample position' - deviceClass: ophyd.EpicsMotor - deviceConfig: - prefix: 'X07MB-ES-MA1:ScanY' +ScanY: + readoutPriority: baseline + description: 'Horizontal sample position' + deviceClass: ophyd.EpicsMotor + deviceConfig: + prefix: 'X07MB-ES-MA1:ScanY' deviceTags: - ES-MA1 - - phoenix_bec/device_configs/phoenix_devices.yaml - onFailure: retry - enabled: true - readOnly: false - softwareTrigger: false + - phoenix_bec/device_configs/phoenix_devices.yaml + onFailure: retry + enabled: true + readOnly: false + softwareTrigger: false # # -# DIODES from ES1 ADC +# DIODES from ES1 ADC # # -SAI_07_MEAN: - readoutPriority: monitored - description: DIODE - deviceClass: ophyd.EpicsSignalRO - deviceConfig: +SAI_07_MEAN: + readoutPriority: monitored + description: DIODE + deviceClass: ophyd.EpicsSignalRO + deviceConfig: auto_monitor: true - read_pv: 'X07MB-OP2-SAI_07:MEAN' - deviceTags: - - PHOENIX - - phoenix_bec/device_configs/phoenix_devices.yaml - onFailure: buffer - enabled: true - readOnly: true - softwareTrigger: false - -SAI_08_MEAN: - readoutPriority: monitored - description: DIODE - deviceClass: ophyd.EpicsSignalRO - deviceConfig: - auto_monitor: true - read_pv: 'X07MB-OP2-SAI_08:MEAN' - deviceTags: + read_pv: 'X07MB-OP2-SAI_07:MEAN' + deviceTags: - PHOENIX - - phoenix_bec/device_configs/phoenix_devices.yaml - onFailure: buffer - enabled: true - readOnly: true - softwareTrigger: false \ No newline at end of file + - phoenix_bec/device_configs/phoenix_devices.yaml + onFailure: buffer + enabled: true + readOnly: true + softwareTrigger: false + +SAI_08_MEAN: + readoutPriority: monitored + description: DIODE + deviceClass: ophyd.EpicsSignalRO + deviceConfig: + auto_monitor: true + read_pv: 'X07MB-OP2-SAI_08:MEAN' + deviceTags: + - PHOENIX + - phoenix_bec/device_configs/phoenix_devices.yaml + onFailure: buffer + enabled: true + readOnly: true + softwareTrigger: false diff --git a/phoenix_bec/local_scripts/Examples/Learn_about_using_bec/DefiningEpics_Channels.py b/phoenix_bec/local_scripts/Examples/Learn_about_ophyd/DefiningEpics_Channels.py similarity index 84% rename from phoenix_bec/local_scripts/Examples/Learn_about_using_bec/DefiningEpics_Channels.py rename to phoenix_bec/local_scripts/Examples/Learn_about_ophyd/DefiningEpics_Channels.py index d2b635f..a2e7667 100644 --- a/phoenix_bec/local_scripts/Examples/Learn_about_using_bec/DefiningEpics_Channels.py +++ b/phoenix_bec/local_scripts/Examples/Learn_about_ophyd/DefiningEpics_Channels.py @@ -9,9 +9,16 @@ DIODE = EpicsSignal(name='SI',read_pv='X07MB-OP2-SAI_07:MEAN') SMPL = EpicsSignal(name='SMPL',read_pv='X07MB-OP2:SMPL') CYCLES = EpicsSignal(name='SMPL',read_pv='X07MB-OP2:TOTAL-CYCLES',write_pv='X07MB-OP2:TOTAL-CYCLES') + +prefix='XXXX:' +y_cpt = Cpt(EpicsMotor, 'ScanX') # Option 2 using component +prefix='X07MB-ES-MA1:' +dd=Device('X07MB-ES-MA1:',name=('device')) +y_cpt_prefix = Cpt(EpicsMotor,'ScanX',parent=Device) class StageXY(Device): + x = Cpt(EpicsMotor, 'ScanX') y = Cpt(EpicsMotor, 'ScanY') @@ -34,6 +41,10 @@ xy_stage = StageXY('X07MB-ES-MA1:', name='stage') # ######################################################### +print(xy_stage.x.prefix) +xy_stage.__dict__ + + # to move motor use # stage.x.move(0) # to see all dict