From fc37892ea15b00b028ade83f97ed9910a8e285e1 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Wed, 8 May 2024 16:59:04 +0200 Subject: [PATCH] fix: fixed import for new ophyd_devices repo structure --- .../bec_device_config_sastt.yaml | 10 +++++----- .../device_configs/e21125_lamni_config.yaml | 20 +++++++++---------- csaxs_bec/device_configs/x12sa_database.yml | 20 +++++++++---------- .../epics/devices/delay_generator_csaxs.py | 2 +- .../devices/epics/devices/eiger9m_csaxs.py | 5 ++++- .../devices/epics/devices/falcon_csaxs.py | 5 ++++- csaxs_bec/devices/epics/devices/mcs_csaxs.py | 5 ++++- .../devices/epics/devices/pilatus_csaxs.py | 5 ++++- .../test_delay_generator_csaxs.py | 2 +- tests/tests_devices/test_eiger9m_csaxs.py | 8 ++++---- tests/tests_devices/test_falcon_csaxs.py | 6 ++++-- tests/tests_devices/test_mcs_card.py | 10 ++++++---- tests/tests_devices/test_pilatus_csaxs.py | 4 ++-- 13 files changed, 59 insertions(+), 43 deletions(-) diff --git a/csaxs_bec/device_configs/bec_device_config_sastt.yaml b/csaxs_bec/device_configs/bec_device_config_sastt.yaml index 4bf3464..30798d1 100755 --- a/csaxs_bec/device_configs/bec_device_config_sastt.yaml +++ b/csaxs_bec/device_configs/bec_device_config_sastt.yaml @@ -198,7 +198,7 @@ samy: softwareTrigger: false micfoc: description: Focusing motor of Microscope stage - deviceClass: ophyd_devices.epics.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.EpicsMotorEx deviceConfig: prefix: X12SA-ES2-ES06 motor_resolution: 0.00125 @@ -216,7 +216,7 @@ micfoc: softwareTrigger: false owis_samx: description: Owis motor stage samx - deviceClass: ophyd_devices.epics.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.EpicsMotorEx deviceConfig: prefix: X12SA-ES2-ES01 motor_resolution: 0.00125 @@ -234,7 +234,7 @@ owis_samx: softwareTrigger: false owis_samy: description: Owis motor stage samx - deviceClass: ophyd_devices.epics.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.EpicsMotorEx deviceConfig: prefix: X12SA-ES2-ES02 motor_resolution: 0.00125 @@ -252,7 +252,7 @@ owis_samy: softwareTrigger: false rotx: description: Rotation stage rotx - deviceClass: ophyd_devices.epics.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.EpicsMotorEx deviceConfig: prefix: X12SA-ES2-ES05 motor_resolution: 0.0025 @@ -273,7 +273,7 @@ rotx: softwareTrigger: false roty: description: Rotation stage rotx - deviceClass: ophyd_devices.epics.devices.EpicsMotorEx + deviceClass: ophyd_devices.devices.EpicsMotorEx deviceConfig: prefix: X12SA-ES2-ES04 motor_resolution: 0.0025 diff --git a/csaxs_bec/device_configs/e21125_lamni_config.yaml b/csaxs_bec/device_configs/e21125_lamni_config.yaml index bd0caa4..67584a8 100644 --- a/csaxs_bec/device_configs/e21125_lamni_config.yaml +++ b/csaxs_bec/device_configs/e21125_lamni_config.yaml @@ -1814,7 +1814,7 @@ sec: softwareTrigger: false sl0h: description: FrontEnd slit virtual movement - deviceClass: ophyd_devices.epics.devices.SlitH + deviceClass: ophyd_devices.devices.SlitH deviceConfig: prefix: 'X12SA-FE-SH1:' deviceTags: @@ -1847,7 +1847,7 @@ sl0trxo: softwareTrigger: false sl1h: description: OpticsHutch slit virtual movement - deviceClass: ophyd_devices.epics.devices.SlitH + deviceClass: ophyd_devices.devices.SlitH deviceConfig: prefix: 'X12SA-OP-SH1:' deviceTags: @@ -1902,7 +1902,7 @@ sl1tryt: softwareTrigger: false sl1v: description: OpticsHutch slit virtual movement - deviceClass: ophyd_devices.epics.devices.SlitV + deviceClass: ophyd_devices.devices.SlitV deviceConfig: prefix: 'X12SA-OP-SV1:' deviceTags: @@ -1913,7 +1913,7 @@ sl1v: softwareTrigger: false sl2h: description: OpticsHutch slit 2 virtual movement - deviceClass: ophyd_devices.epics.devices.SlitH + deviceClass: ophyd_devices.devices.SlitH deviceConfig: prefix: 'X12SA-OP-SH2:' deviceTags: @@ -1968,7 +1968,7 @@ sl2tryt: softwareTrigger: false sl2v: description: OpticsHutch slit 2 virtual movement - deviceClass: ophyd_devices.epics.devices.SlitV + deviceClass: ophyd_devices.devices.SlitV deviceConfig: prefix: 'X12SA-OP-SV2:' deviceTags: @@ -1979,7 +1979,7 @@ sl2v: softwareTrigger: false strox: description: Girder virtual pitch - deviceClass: ophyd_devices.epics.devices.GirderMotorPITCH + deviceClass: ophyd_devices.devices.GirderMotorPITCH deviceConfig: prefix: X12SA-HG deviceTags: @@ -1990,7 +1990,7 @@ strox: softwareTrigger: false stroy: description: Girder virtual yaw - deviceClass: ophyd_devices.epics.devices.GirderMotorYAW + deviceClass: ophyd_devices.devices.GirderMotorYAW deviceConfig: prefix: X12SA-HG deviceTags: @@ -2001,7 +2001,7 @@ stroy: softwareTrigger: false stroz: description: Girder virtual roll - deviceClass: ophyd_devices.epics.devices.GirderMotorROLL + deviceClass: ophyd_devices.devices.GirderMotorROLL deviceConfig: prefix: X12SA-HG deviceTags: @@ -2012,7 +2012,7 @@ stroz: softwareTrigger: false sttrx: description: Girder X translation - deviceClass: ophyd_devices.epics.devices.GirderMotorX1 + deviceClass: ophyd_devices.devices.GirderMotorX1 deviceConfig: prefix: X12SA-HG deviceTags: @@ -2023,7 +2023,7 @@ sttrx: softwareTrigger: false sttry: description: Girder Y translation - deviceClass: ophyd_devices.epics.devices.GirderMotorY1 + deviceClass: ophyd_devices.devices.GirderMotorY1 deviceConfig: prefix: X12SA-HG deviceTags: diff --git a/csaxs_bec/device_configs/x12sa_database.yml b/csaxs_bec/device_configs/x12sa_database.yml index 2bee4f9..892be0d 100644 --- a/csaxs_bec/device_configs/x12sa_database.yml +++ b/csaxs_bec/device_configs/x12sa_database.yml @@ -1232,7 +1232,7 @@ sec: softwareTrigger: false sl0h: description: FrontEnd slit virtual movement - deviceClass: ophyd_devices.epics.devices.SlitH + deviceClass: ophyd_devices.devices.SlitH deviceConfig: prefix: 'X12SA-FE-SH1:' deviceTags: @@ -1265,7 +1265,7 @@ sl0trxo: softwareTrigger: false sl1h: description: OpticsHutch slit virtual movement - deviceClass: ophyd_devices.epics.devices.SlitH + deviceClass: ophyd_devices.devices.SlitH deviceConfig: prefix: 'X12SA-OP-SH1:' deviceTags: @@ -1320,7 +1320,7 @@ sl1tryt: softwareTrigger: false sl1v: description: OpticsHutch slit virtual movement - deviceClass: ophyd_devices.epics.devices.SlitV + deviceClass: ophyd_devices.devices.SlitV deviceConfig: prefix: 'X12SA-OP-SV1:' deviceTags: @@ -1331,7 +1331,7 @@ sl1v: softwareTrigger: false sl2h: description: OpticsHutch slit 2 virtual movement - deviceClass: ophyd_devices.epics.devices.SlitH + deviceClass: ophyd_devices.devices.SlitH deviceConfig: prefix: 'X12SA-OP-SH2:' deviceTags: @@ -1386,7 +1386,7 @@ sl2tryt: softwareTrigger: false sl2v: description: OpticsHutch slit 2 virtual movement - deviceClass: ophyd_devices.epics.devices.SlitV + deviceClass: ophyd_devices.devices.SlitV deviceConfig: prefix: 'X12SA-OP-SV2:' deviceTags: @@ -1397,7 +1397,7 @@ sl2v: softwareTrigger: false strox: description: Girder virtual pitch - deviceClass: ophyd_devices.epics.devices.GirderMotorPITCH + deviceClass: ophyd_devices.devices.GirderMotorPITCH deviceConfig: prefix: X12SA-HG deviceTags: @@ -1408,7 +1408,7 @@ strox: softwareTrigger: false stroy: description: Girder virtual yaw - deviceClass: ophyd_devices.epics.devices.GirderMotorYAW + deviceClass: ophyd_devices.devices.GirderMotorYAW deviceConfig: prefix: X12SA-HG deviceTags: @@ -1419,7 +1419,7 @@ stroy: softwareTrigger: false stroz: description: Girder virtual roll - deviceClass: ophyd_devices.epics.devices.GirderMotorROLL + deviceClass: ophyd_devices.devices.GirderMotorROLL deviceConfig: prefix: X12SA-HG deviceTags: @@ -1430,7 +1430,7 @@ stroz: softwareTrigger: false sttrx: description: Girder X translation - deviceClass: ophyd_devices.epics.devices.GirderMotorX1 + deviceClass: ophyd_devices.devices.GirderMotorX1 deviceConfig: prefix: X12SA-HG deviceTags: @@ -1441,7 +1441,7 @@ sttrx: softwareTrigger: false sttry: description: Girder Y translation - deviceClass: ophyd_devices.epics.devices.GirderMotorY1 + deviceClass: ophyd_devices.devices.GirderMotorY1 deviceConfig: prefix: X12SA-HG deviceTags: diff --git a/csaxs_bec/devices/epics/devices/delay_generator_csaxs.py b/csaxs_bec/devices/epics/devices/delay_generator_csaxs.py index 3b0dee2..c0d521b 100644 --- a/csaxs_bec/devices/epics/devices/delay_generator_csaxs.py +++ b/csaxs_bec/devices/epics/devices/delay_generator_csaxs.py @@ -1,6 +1,6 @@ from bec_lib import bec_logger from ophyd import Component -from ophyd_devices.epics.devices.psi_delay_generator_base import ( +from ophyd_devices.interfaces.base_classes.psi_delay_generator_base import ( DDGCustomMixin, PSIDelayGeneratorBase, TriggerSource, diff --git a/csaxs_bec/devices/epics/devices/eiger9m_csaxs.py b/csaxs_bec/devices/epics/devices/eiger9m_csaxs.py index bee199c..de31092 100644 --- a/csaxs_bec/devices/epics/devices/eiger9m_csaxs.py +++ b/csaxs_bec/devices/epics/devices/eiger9m_csaxs.py @@ -10,7 +10,10 @@ from bec_lib.endpoints import MessageEndpoints from bec_lib.logger import bec_logger from ophyd import ADComponent as ADCpt from ophyd import Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV -from ophyd_devices.epics.devices.psi_detector_base import CustomDetectorMixin, PSIDetectorBase +from ophyd_devices.interfaces.base_classes.psi_detector_base import ( + CustomDetectorMixin, + PSIDetectorBase, +) from std_daq_client import StdDaqClient logger = bec_logger.logger diff --git a/csaxs_bec/devices/epics/devices/falcon_csaxs.py b/csaxs_bec/devices/epics/devices/falcon_csaxs.py index 170d2cf..19ed20e 100644 --- a/csaxs_bec/devices/epics/devices/falcon_csaxs.py +++ b/csaxs_bec/devices/epics/devices/falcon_csaxs.py @@ -7,7 +7,10 @@ from bec_lib.logger import bec_logger from ophyd import Component as Cpt from ophyd import Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV from ophyd.mca import EpicsMCARecord -from ophyd_devices.epics.devices.psi_detector_base import CustomDetectorMixin, PSIDetectorBase +from ophyd_devices.interfaces.base_classes.psi_detector_base import ( + CustomDetectorMixin, + PSIDetectorBase, +) logger = bec_logger.logger diff --git a/csaxs_bec/devices/epics/devices/mcs_csaxs.py b/csaxs_bec/devices/epics/devices/mcs_csaxs.py index e0fef5e..dfe9b36 100644 --- a/csaxs_bec/devices/epics/devices/mcs_csaxs.py +++ b/csaxs_bec/devices/epics/devices/mcs_csaxs.py @@ -6,7 +6,10 @@ import numpy as np from bec_lib import MessageEndpoints, bec_logger, messages, threadlocked from ophyd import Component as Cpt from ophyd import Device, EpicsSignal, EpicsSignalRO -from ophyd_devices.epics.devices.psi_detector_base import CustomDetectorMixin, PSIDetectorBase +from ophyd_devices.interfaces.base_classes.psi_detector_base import ( + CustomDetectorMixin, + PSIDetectorBase, +) from ophyd_devices.utils import bec_utils logger = bec_logger.logger diff --git a/csaxs_bec/devices/epics/devices/pilatus_csaxs.py b/csaxs_bec/devices/epics/devices/pilatus_csaxs.py index 4c55442..54a021e 100644 --- a/csaxs_bec/devices/epics/devices/pilatus_csaxs.py +++ b/csaxs_bec/devices/epics/devices/pilatus_csaxs.py @@ -8,7 +8,10 @@ import requests from bec_lib import MessageEndpoints, bec_logger, messages from ophyd import ADComponent as ADCpt from ophyd import Device, EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV, Staged -from ophyd_devices.epics.devices.psi_detector_base import CustomDetectorMixin, PSIDetectorBase +from ophyd_devices.interfaces.base_classes.psi_detector_base import ( + CustomDetectorMixin, + PSIDetectorBase, +) logger = bec_logger.logger diff --git a/tests/tests_devices/test_delay_generator_csaxs.py b/tests/tests_devices/test_delay_generator_csaxs.py index 4b92ca5..d5de3ff 100644 --- a/tests/tests_devices/test_delay_generator_csaxs.py +++ b/tests/tests_devices/test_delay_generator_csaxs.py @@ -2,7 +2,7 @@ from unittest import mock import pytest -from ophyd_devices.epics.devices.psi_delay_generator_base import TriggerSource +from ophyd_devices.interfaces.base_classes.psi_delay_generator_base import TriggerSource from csaxs_bec.devices.epics.devices.delay_generator_csaxs import DDGSetup diff --git a/tests/tests_devices/test_eiger9m_csaxs.py b/tests/tests_devices/test_eiger9m_csaxs.py index 2feffe2..4a23155 100644 --- a/tests/tests_devices/test_eiger9m_csaxs.py +++ b/tests/tests_devices/test_eiger9m_csaxs.py @@ -29,9 +29,9 @@ def mock_det(): dm = DMMock() with mock.patch.object(dm, "connector"): with ( - mock.patch("ophyd_devices.epics.devices.psi_detector_base.FileWriter"), + mock.patch("ophyd_devices.interfaces.base_classes.psi_detector_base.FileWriter"), mock.patch( - "ophyd_devices.epics.devices.psi_detector_base.PSIDetectorBase._update_service_config" + "ophyd_devices.interfaces.base_classes.psi_detector_base.PSIDetectorBase._update_service_config" ), ): with mock.patch.object(ophyd, "cl") as mock_cl: @@ -53,9 +53,9 @@ def test_init(): dm = DMMock() with mock.patch.object(dm, "connector"): with ( - mock.patch("ophyd_devices.epics.devices.psi_detector_base.FileWriter"), + mock.patch("ophyd_devices.interfaces.base_classes.psi_detector_base.FileWriter"), mock.patch( - "ophyd_devices.epics.devices.psi_detector_base.PSIDetectorBase._update_service_config" + "ophyd_devices.interfaces.base_classes.psi_detector_base.PSIDetectorBase._update_service_config" ), ): with mock.patch.object(ophyd, "cl") as mock_cl: diff --git a/tests/tests_devices/test_falcon_csaxs.py b/tests/tests_devices/test_falcon_csaxs.py index de1f2db..d61a359 100644 --- a/tests/tests_devices/test_falcon_csaxs.py +++ b/tests/tests_devices/test_falcon_csaxs.py @@ -30,9 +30,11 @@ def mock_det(): dm = DMMock() with mock.patch.object(dm, "connector"): with ( - mock.patch("ophyd_devices.epics.devices.psi_detector_base.FileWriter") as filemixin, mock.patch( - "ophyd_devices.epics.devices.psi_detector_base.PSIDetectorBase._update_service_config" + "ophyd_devices.interfaces.base_classes.psi_detector_base.FileWriter" + ) as filemixin, + mock.patch( + "ophyd_devices.interfaces.base_classes.psi_detector_base.PSIDetectorBase._update_service_config" ) as mock_service_config, ): with mock.patch.object(ophyd, "cl") as mock_cl: diff --git a/tests/tests_devices/test_mcs_card.py b/tests/tests_devices/test_mcs_card.py index 363f92a..f2cb95b 100644 --- a/tests/tests_devices/test_mcs_card.py +++ b/tests/tests_devices/test_mcs_card.py @@ -35,9 +35,11 @@ def mock_det(): dm = DMMock() with mock.patch.object(dm, "connector"): with ( - mock.patch("ophyd_devices.epics.devices.psi_detector_base.FileWriter") as filemixin, mock.patch( - "ophyd_devices.epics.devices.psi_detector_base.PSIDetectorBase._update_service_config" + "ophyd_devices.interfaces.base_classes.psi_detector_base.FileWriter" + ) as filemixin, + mock.patch( + "ophyd_devices.interfaces.base_classes.psi_detector_base.PSIDetectorBase._update_service_config" ) as mock_service_config, ): with mock.patch.object(ophyd, "cl") as mock_cl: @@ -57,9 +59,9 @@ def test_init(): dm = DMMock() with mock.patch.object(dm, "connector"): with ( - mock.patch("ophyd_devices.epics.devices.psi_detector_base.FileWriter"), + mock.patch("ophyd_devices.interfaces.base_classes.psi_detector_base.FileWriter"), mock.patch( - "ophyd_devices.epics.devices.psi_detector_base.PSIDetectorBase._update_service_config" + "ophyd_devices.interfaces.base_classes.psi_detector_base.PSIDetectorBase._update_service_config" ), ): with mock.patch.object(ophyd, "cl") as mock_cl: diff --git a/tests/tests_devices/test_pilatus_csaxs.py b/tests/tests_devices/test_pilatus_csaxs.py index 75d0bfe..4ba0819 100644 --- a/tests/tests_devices/test_pilatus_csaxs.py +++ b/tests/tests_devices/test_pilatus_csaxs.py @@ -30,9 +30,9 @@ def mock_det(): dm = DMMock() with mock.patch.object(dm, "connector"): with ( - mock.patch("ophyd_devices.epics.devices.psi_detector_base.FileWriter"), + mock.patch("ophyd_devices.interfaces.base_classes.psi_detector_base.FileWriter"), mock.patch( - "ophyd_devices.epics.devices.psi_detector_base.PSIDetectorBase._update_service_config" + "ophyd_devices.interfaces.base_classes.psi_detector_base.PSIDetectorBase._update_service_config" ), ): with mock.patch.object(ophyd, "cl") as mock_cl: