From 5725fc36c7aff052fc704782a99bd04cfb13c112 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Tue, 23 Apr 2024 22:12:28 +0200 Subject: [PATCH] fix: updated device configs to new import schema --- .../epics/db/office_teststand_bec_config.yaml | 14 +++--- ophyd_devices/epics/db/test_database.yml | 10 ++-- ophyd_devices/epics/db/x07ma_database.yaml | 50 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ophyd_devices/epics/db/office_teststand_bec_config.yaml b/ophyd_devices/epics/db/office_teststand_bec_config.yaml index f5eb81f..1fc59b4 100644 --- a/ophyd_devices/epics/db/office_teststand_bec_config.yaml +++ b/ophyd_devices/epics/db/office_teststand_bec_config.yaml @@ -1,7 +1,7 @@ es1_roty: description: 'Test rotation stage' # deviceClass: EpicsMotor - deviceClass: epics:devices:EpicsMotorX + deviceClass: ophyd_devices.epics.devices.EpicsMotorX deviceConfig: {prefix: 'X02DA-ES1-SMP1:ROTY'} onFailure: buffer enabled: true @@ -9,7 +9,7 @@ es1_roty: es1_aa1: description: 'Rotation stage controller status' - deviceClass: epics:devices:aa1Controller + deviceClass: ophyd_devices.epics.devices.aa1Controller deviceConfig: {prefix: 'X02DA-ES1-SMP1:CTRL:'} onFailure: buffer enabled: true @@ -17,7 +17,7 @@ es1_aa1: es1_aa1Tasks: description: 'AA1 task management interface' - deviceClass: epics:devices:aa1Tasks + deviceClass: ophyd_devices.epics.devices.aa1Tasks deviceConfig: {prefix: 'X02DA-ES1-SMP1:TASK:'} onFailure: buffer enabled: true @@ -25,7 +25,7 @@ es1_aa1Tasks: es1_aa1GlobalVar: description: 'AA1 global variables interface' - deviceClass: epics:devices:aa1GlobalVariables + deviceClass: ophyd_devices.epics.devices.aa1GlobalVariables deviceConfig: {prefix: 'X02DA-ES1-SMP1:VAR:'} onFailure: buffer enabled: true @@ -33,7 +33,7 @@ es1_aa1GlobalVar: es1_aa1GlobalMon: description: 'AA1 polled global variable interface' - deviceClass: epics:devices:aa1GlobalVariableBindings + deviceClass: ophyd_devices.epics.devices.aa1GlobalVariableBindings deviceConfig: {prefix: 'X02DA-ES1-SMP1:VAR:'} onFailure: buffer enabled: true @@ -41,7 +41,7 @@ es1_aa1GlobalMon: es1_psod: description: 'AA1 PSO output interface' - deviceClass: epics:devices:aa1AxisPsoDistance + deviceClass: ophyd_devices.epics.devices.aa1AxisPsoDistance deviceConfig: {prefix: 'X02DA-ES1-SMP1:ROTY:PSO:'} onFailure: buffer enabled: true @@ -49,7 +49,7 @@ es1_psod: es1_ddaq: description: 'AA1 drive data collection interface' - deviceClass: epics:devices:aa1AxisDriveDataCollection + deviceClass: ophyd_devices.epics.devices.aa1AxisDriveDataCollection deviceConfig: {prefix: 'X02DA-ES1-SMP1:ROTY:DDC:'} onFailure: buffer enabled: true diff --git a/ophyd_devices/epics/db/test_database.yml b/ophyd_devices/epics/db/test_database.yml index d3531e2..cf54478 100644 --- a/ophyd_devices/epics/db/test_database.yml +++ b/ophyd_devices/epics/db/test_database.yml @@ -1,7 +1,7 @@ motor1: readoutPriority: baseline description: 'Simulated axis 1' - deviceClass: SynAxis + deviceClass: ophyd.sim.SynAxis deviceConfig: name: motor1 deviceTags: @@ -14,7 +14,7 @@ motor1: motor2: readoutPriority: baseline description: 'Simulated axis 2' - deviceClass: SynAxis + deviceClass: ophyd.sim.SynAxis deviceConfig: name: motor2 deviceTags: @@ -27,7 +27,7 @@ motor2: det1: readoutPriority: baseline description: 'Simulated signal 1' - deviceClass: SynSignal + deviceClass: ophyd.sim.SynSignal deviceConfig: name: det1 deviceTags: @@ -40,7 +40,7 @@ det1: det2: readoutPriority: baseline description: 'Simulated signal 2' - deviceClass: SynSignal + deviceClass: ophyd.sim.SynSignal deviceConfig: name: det2 deviceTags: @@ -53,7 +53,7 @@ det2: per1: readoutPriority: baseline description: 'Simulated periodic signal 1' - deviceClass: SynPeriodicSignal + deviceClass: ophyd.sim.SynPeriodicSignal deviceConfig: name: per1 deviceTags: diff --git a/ophyd_devices/epics/db/x07ma_database.yaml b/ophyd_devices/epics/db/x07ma_database.yaml index 173233f..169728d 100644 --- a/ophyd_devices/epics/db/x07ma_database.yaml +++ b/ophyd_devices/epics/db/x07ma_database.yaml @@ -1,7 +1,7 @@ slsinfo: readoutPriority: baseline description: 'SLS beam info' - deviceClass: SLSInfo + deviceClass: ophyd_devices.SLSInfo deviceConfig: {} onFailure: buffer enabled: true @@ -11,7 +11,7 @@ slsinfo: undulator: readoutPriority: baseline description: 'Undulator' - deviceClass: X07MAUndulator + deviceClass: ophyd_devices.X07MAUndulator deviceConfig: prefix: 'X07MA-ID:' onFailure: retry @@ -22,7 +22,7 @@ undulator: aperture: readoutPriority: baseline description: 'Frontend aperture' - deviceClass: EpicsSignal + deviceClass: ophyd.EpicsSignal deviceConfig: read_pv: 'X07MA-FE-DSAPER' onFailure: retry @@ -33,7 +33,7 @@ aperture: mono: readoutPriority: baseline description: 'PGM Monochromator' - deviceClass: PGMMonochromator + deviceClass: ophyd_devices.PGMMonochromator deviceConfig: prefix: 'X07MA-' onFailure: retry @@ -44,7 +44,7 @@ mono: otf: readoutPriority: baseline description: 'PGM on-the-fly scan' - deviceClass: PGMOtFScan + deviceClass: ophyd_devices.PGMOtFScan deviceConfig: {} onFailure: retry enabled: true @@ -54,7 +54,7 @@ otf: valve: readoutPriority: baseline description: 'Endstation valve' - deviceClass: VacuumValve + deviceClass: ophyd_devices.VacuumValve deviceConfig: prefix: 'X07MA-OP-VG13:' onFailure: retry @@ -65,7 +65,7 @@ valve: exit_slit: readoutPriority: baseline description: 'Exit slit' - deviceClass: X07MAExitSlit + deviceClass: ophyd_devices.X07MAExitSlit deviceConfig: prefix: 'X07MA-OP-SL1SV1:' onFailure: retry @@ -76,7 +76,7 @@ exit_slit: goldmesh1: readoutPriority: baseline description: 'Gold mesh 1' - deviceClass: EpicsMotor + deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X07MA-OP-IO1:TR1' onFailure: retry @@ -87,7 +87,7 @@ goldmesh1: goldmesh2: readoutPriority: baseline description: 'Gold mesh 2' - deviceClass: EpicsMotor + deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X07MA-OP-IO2:TR1' onFailure: retry @@ -98,7 +98,7 @@ goldmesh2: field_x: readoutPriority: baseline description: 'Magnetic field x' - deviceClass: X07MAMagnetAxis + deviceClass: ophyd_devices.X07MAMagnetAxis deviceConfig: axis_id: X ps_prefix: "X07MA-PC-PS2:" @@ -111,7 +111,7 @@ field_x: field_z: readoutPriority: baseline description: 'Magnetic field z' - deviceClass: X07MAMagnetAxis + deviceClass: ophyd_devices.X07MAMagnetAxis deviceConfig: axis_id: Z ps_prefix: "X07MA-PC-PS1:" @@ -124,7 +124,7 @@ field_z: signals: readoutPriority: baseline description: 'ADC signals' - deviceClass: X07MAAnalogSignals + deviceClass: ophyd_devices.X07MAAnalogSignals deviceConfig: prefix: 'X07MA-ES1-AI:' onFailure: retry @@ -135,7 +135,7 @@ signals: sample_hor: readoutPriority: baseline description: 'Horizontal sample position' - deviceClass: EpicsMotor + deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X07MA-ES1-MAG:TRZS' onFailure: retry @@ -146,7 +146,7 @@ sample_hor: sample_vert: readoutPriority: baseline description: 'Horizontal sample position' - deviceClass: EpicsMotor + deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X07MA-ES1-MAG:TRY1' onFailure: retry @@ -157,7 +157,7 @@ sample_vert: sample_rot: readoutPriority: baseline description: 'Horizontal sample position' - deviceClass: EpicsMotor + deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X07MA-ES1-MAG:ROY1' onFailure: retry @@ -168,7 +168,7 @@ sample_rot: harmonic: readoutPriority: baseline description: 'ID harmonic' - deviceClass: EpicsSignal + deviceClass: ophyd.EpicsSignal deviceConfig: read_pv: 'X07MA-ID:HARMONIC' onFailure: retry @@ -179,7 +179,7 @@ harmonic: energy: readoutPriority: baseline description: 'Energy in eV' - deviceClass: EpicsSignal + deviceClass: ophyd.EpicsSignal deviceConfig: read_pv: 'X07MA-PHS-E:GO.A' onFailure: retry @@ -190,7 +190,7 @@ energy: energy_mode: readoutPriority: baseline description: 'Energy mode. Either PGM = 0 or PGM+ID = 1' - deviceClass: EpicsSignal + deviceClass: ophyd.EpicsSignal deviceConfig: read_pv: 'X07MA-PHS-E:OPT' onFailure: retry @@ -201,7 +201,7 @@ energy_mode: keithley_1: readoutPriority: baseline description: 'Keithley 1 / 428 tey' - deviceClass: EpicsSignal + deviceClass: ophyd.EpicsSignal deviceConfig: read_pv: 'X07MA-PC-K428:1:setGain' onFailure: retry @@ -212,7 +212,7 @@ keithley_1: keithley_2: readoutPriority: baseline description: 'Keithley 2 / 428 i0' - deviceClass: EpicsSignal + deviceClass: ophyd.EpicsSignal deviceConfig: read_pv: 'X07MA-PC-K428:2:setGain' onFailure: retry @@ -223,7 +223,7 @@ keithley_2: keithley_3: readoutPriority: baseline description: 'Keithley 3 / 428 diode' - deviceClass: EpicsSignal + deviceClass: ophyd.EpicsSignal deviceConfig: read_pv: 'X07MA-PC-K428:3:setGain' onFailure: retry @@ -234,7 +234,7 @@ keithley_3: temperature: readoutPriority: baseline description: 'Temperature controller' - deviceClass: X07MATemperatureController + deviceClass: ophyd_devices.X07MATemperatureController deviceConfig: prefix: 'X07MA-PC-TC:' onFailure: retry @@ -245,7 +245,7 @@ temperature: tcontrol: readoutPriority: baseline description: 'Automatic temperature control' - deviceClass: X07MAAutoTemperatureControl + deviceClass: ophyd_devices.X07MAAutoTemperatureControl deviceConfig: prefix: 'X07MA-ES1-TEMP:' onFailure: retry @@ -256,7 +256,7 @@ tcontrol: sls_info: readoutPriority: on_request description: 'sls info' - deviceClass: SLSInfo + deviceClass: ophyd_devices.SLSInfo deviceConfig: {} onFailure: buffer enabled: true @@ -266,7 +266,7 @@ sls_info: sls_operator: readoutPriority: on_request description: 'sls operator messages' - deviceClass: SLSOperatorMessages + deviceClass: ophyd_devices.SLSOperatorMessages deviceConfig: {} onFailure: buffer enabled: true