fix: fixed import after refactoring

This commit is contained in:
2024-05-14 14:08:19 +02:00
parent 1d266c5da9
commit 8a24692e82
4 changed files with 14 additions and 16 deletions

View File

@@ -3,7 +3,7 @@
############################################################
leyex:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: G
host: mpc2680.psi.ch
@@ -22,7 +22,7 @@ leyex:
in: 14.117
leyey:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: H
host: mpc2680.psi.ch
@@ -42,7 +42,7 @@ leyey:
out: 0.5
loptx:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: E
host: mpc2680.psi.ch
@@ -62,7 +62,7 @@ loptx:
out: -0.699
lopty:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: F
host: mpc2680.psi.ch
@@ -82,7 +82,7 @@ lopty:
out: 3.53
loptz:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: D
host: mpc2680.psi.ch
@@ -99,7 +99,7 @@ loptz:
readoutPriority: baseline
lsamrot:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: C
host: mpc2680.psi.ch
@@ -116,7 +116,7 @@ lsamrot:
readoutPriority: baseline
lsamx:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: A
host: mpc2680.psi.ch
@@ -135,7 +135,7 @@ lsamx:
center: 8.768
lsamy:
description: phase plate angle
deviceClass: csaxs_bec.devices.galil.galil_ophyd.GalilMotor
deviceClass: csaxs_bec.devices.galil.lgalil_ophyd.LamniGalilMotor
deviceConfig:
axis_Id: B
host: mpc2680.psi.ch

View File

@@ -1,4 +1,4 @@
from .fgalil_ophyd import FlomniGalilController, FlomniGalilMotor
from .fupr_ophyd import FuprGalilController, FuprGalilMotor
from .galil_ophyd import GalilController, GalilMotor
from .lgalil_ophyd import LamniGalilController, LamniGalilMotor
from .sgalil_ophyd import SGalilMotor

View File

@@ -3,13 +3,13 @@ from unittest import mock
import pytest
from ophyd_devices.tests.utils import SocketMock
from csaxs_bec.devices.galil.galil_ophyd import GalilController, GalilMotor
from csaxs_bec.devices.galil.lgalil_ophyd import LamniGalilController, LamniGalilMotor
@pytest.fixture(scope="function")
def leyey():
GalilController._reset_controller()
leyey_motor = GalilMotor(
LamniGalilController._reset_controller()
leyey_motor = LamniGalilMotor(
"H", name="leyey", host="mpc2680.psi.ch", port=8081, socket_cls=SocketMock
)
leyey_motor.controller.on()
@@ -20,8 +20,8 @@ def leyey():
@pytest.fixture(scope="function")
def leyex():
GalilController._reset_controller()
leyex_motor = GalilMotor(
LamniGalilController._reset_controller()
leyex_motor = LamniGalilMotor(
"A", name="leyey", host="mpc2680.psi.ch", port=8081, socket_cls=SocketMock
)
leyex_motor.controller.on()

View File

@@ -1,5 +1,3 @@
from unittest import mock
import pytest
from ophyd_devices.tests.utils import SocketMock