From 7d93154761299b5dfa0793e09c00e0807ced51ff Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Tue, 14 May 2024 13:32:48 +0200 Subject: [PATCH] refactor: renamed rt_lamni module to rt --- csaxs_bec/device_configs/e21125_lamni_config.yaml | 4 ++-- csaxs_bec/device_configs/flomni_config.yaml | 6 +++--- csaxs_bec/device_configs/flomni_test_config.yaml | 6 +++--- csaxs_bec/devices/{rt_lamni => rt}/__init__.py | 0 csaxs_bec/devices/{rt_lamni => rt}/rt_flomni_ophyd.py | 2 +- csaxs_bec/devices/{rt_lamni => rt}/rt_lamni_ophyd.py | 2 +- csaxs_bec/devices/{rt_lamni => rt}/rt_ophyd.py | 0 tests/tests_devices/test_rt_flomni.py | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename csaxs_bec/devices/{rt_lamni => rt}/__init__.py (100%) rename csaxs_bec/devices/{rt_lamni => rt}/rt_flomni_ophyd.py (99%) rename csaxs_bec/devices/{rt_lamni => rt}/rt_lamni_ophyd.py (99%) rename csaxs_bec/devices/{rt_lamni => rt}/rt_ophyd.py (100%) diff --git a/csaxs_bec/device_configs/e21125_lamni_config.yaml b/csaxs_bec/device_configs/e21125_lamni_config.yaml index 86173a2..feb5868 100644 --- a/csaxs_bec/device_configs/e21125_lamni_config.yaml +++ b/csaxs_bec/device_configs/e21125_lamni_config.yaml @@ -162,7 +162,7 @@ lsamy: ############################################################ rtx: - deviceClass: csaxs_bec.devices.rt_lamni.rt_lamni_ophyd.RtLamniMotor + deviceClass: csaxs_bec.devices.rt.rt_lamni_ophyd.RtLamniMotor deviceConfig: axis_Id: A device_access: true @@ -179,7 +179,7 @@ rtx: enabled: true readOnly: False rty: - deviceClass: csaxs_bec.devices.rt_lamni.rt_lamni_ophyd.RtLamniMotor + deviceClass: csaxs_bec.devices.rt.rt_lamni_ophyd.RtLamniMotor deviceConfig: axis_Id: B device_access: true diff --git a/csaxs_bec/device_configs/flomni_config.yaml b/csaxs_bec/device_configs/flomni_config.yaml index 4cd38ec..99bcd5c 100644 --- a/csaxs_bec/device_configs/flomni_config.yaml +++ b/csaxs_bec/device_configs/flomni_config.yaml @@ -302,7 +302,7 @@ ftray: readoutPriority: baseline rtx: description: flomni rt - deviceClass: csaxs_bec.devices.rt_lamni.rt_flomni_ophyd.RtFlomniMotor + deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor deviceConfig: axis_Id: A host: mpc2844.psi.ch @@ -318,7 +318,7 @@ rtx: rt_pid_voltage: -0.06219 rty: description: flomni rt - deviceClass: csaxs_bec.devices.rt_lamni.rt_flomni_ophyd.RtFlomniMotor + deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor deviceConfig: axis_Id: B host: mpc2844.psi.ch @@ -332,7 +332,7 @@ rty: tomo_additional_offsety: 0 rtz: description: flomni rt - deviceClass: csaxs_bec.devices.rt_lamni.rt_flomni_ophyd.RtFlomniMotor + deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor deviceConfig: axis_Id: C host: mpc2844.psi.ch diff --git a/csaxs_bec/device_configs/flomni_test_config.yaml b/csaxs_bec/device_configs/flomni_test_config.yaml index 1251eb9..51058fd 100644 --- a/csaxs_bec/device_configs/flomni_test_config.yaml +++ b/csaxs_bec/device_configs/flomni_test_config.yaml @@ -305,7 +305,7 @@ flomni_samples: rtx: readoutPriority: on_request description: flomni rt - deviceClass: csaxs_bec.devices.rt_lamni.rt_flomni_ophyd.RtFlomniMotor + deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor deviceConfig: axis_Id: A host: mpc2844.psi.ch @@ -317,7 +317,7 @@ rtx: rty: readoutPriority: on_request description: flomni rt - deviceClass: csaxs_bec.devices.rt_lamni.rt_flomni_ophyd.RtFlomniMotor + deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor deviceConfig: axis_Id: B host: mpc2844.psi.ch @@ -329,7 +329,7 @@ rty: rtz: readoutPriority: on_request description: flomni rt - deviceClass: csaxs_bec.devices.rt_lamni.rt_flomni_ophyd.RtFlomniMotor + deviceClass: csaxs_bec.devices.rt.rt_flomni_ophyd.RtFlomniMotor deviceConfig: axis_Id: C host: mpc2844.psi.ch diff --git a/csaxs_bec/devices/rt_lamni/__init__.py b/csaxs_bec/devices/rt/__init__.py similarity index 100% rename from csaxs_bec/devices/rt_lamni/__init__.py rename to csaxs_bec/devices/rt/__init__.py diff --git a/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py b/csaxs_bec/devices/rt/rt_flomni_ophyd.py similarity index 99% rename from csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py rename to csaxs_bec/devices/rt/rt_flomni_ophyd.py index ea4ab9d..53f9cb1 100644 --- a/csaxs_bec/devices/rt_lamni/rt_flomni_ophyd.py +++ b/csaxs_bec/devices/rt/rt_flomni_ophyd.py @@ -13,7 +13,7 @@ from ophyd_devices.utils.controller import Controller, threadlocked from ophyd_devices.utils.socket import SocketIO, raise_if_disconnected from prettytable import PrettyTable -from csaxs_bec.devices.rt_lamni.rt_ophyd import ( +from csaxs_bec.devices.rt.rt_ophyd import ( BECConfigError, RtCommunicationError, RtError, diff --git a/csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py b/csaxs_bec/devices/rt/rt_lamni_ophyd.py similarity index 99% rename from csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py rename to csaxs_bec/devices/rt/rt_lamni_ophyd.py index 6891f42..462ce26 100644 --- a/csaxs_bec/devices/rt_lamni/rt_lamni_ophyd.py +++ b/csaxs_bec/devices/rt/rt_lamni_ophyd.py @@ -12,7 +12,7 @@ from ophyd.utils import LimitError, ReadOnlyError from ophyd_devices.utils.controller import Controller, threadlocked from ophyd_devices.utils.socket import SocketIO, SocketSignal, raise_if_disconnected -from csaxs_bec.devices.rt_lamni.rt_ophyd import RtCommunicationError, RtError +from csaxs_bec.devices.rt.rt_ophyd import RtCommunicationError, RtError logger = bec_logger.logger diff --git a/csaxs_bec/devices/rt_lamni/rt_ophyd.py b/csaxs_bec/devices/rt/rt_ophyd.py similarity index 100% rename from csaxs_bec/devices/rt_lamni/rt_ophyd.py rename to csaxs_bec/devices/rt/rt_ophyd.py diff --git a/tests/tests_devices/test_rt_flomni.py b/tests/tests_devices/test_rt_flomni.py index 68808ac..f0c61d7 100644 --- a/tests/tests_devices/test_rt_flomni.py +++ b/tests/tests_devices/test_rt_flomni.py @@ -3,8 +3,8 @@ from unittest import mock import pytest from ophyd_devices.tests.utils import SocketMock -from csaxs_bec.devices.rt_lamni import RtFlomniController, RtFlomniMotor -from csaxs_bec.devices.rt_lamni.rt_ophyd import RtError +from csaxs_bec.devices.rt import RtFlomniController, RtFlomniMotor +from csaxs_bec.devices.rt.rt_ophyd import RtError @pytest.fixture()