Skip to content

Commit

Permalink
Remove QBPM as it's not currently used (#747)
Browse files Browse the repository at this point in the history
  • Loading branch information
DominicOram authored Aug 15, 2024
1 parent f8c493e commit 608d913
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 25 deletions.
12 changes: 0 additions & 12 deletions src/dodal/beamlines/i03.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
from dodal.devices.motors import XYZPositioner
from dodal.devices.oav.oav_detector import OAV, OAVConfigParams
from dodal.devices.oav.pin_image_recognition import PinTipDetection
from dodal.devices.qbpm1 import QBPM1
from dodal.devices.robot import BartRobot
from dodal.devices.s4_slit_gaps import S4SlitGaps
from dodal.devices.smargon import Smargon
Expand Down Expand Up @@ -103,17 +102,6 @@ def dcm(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) ->
)


@skip_device(lambda: BL == "s03")
def qbpm1(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -> QBPM1:
return device_instantiation(
device_factory=QBPM1,
name="qbpm1",
prefix="",
wait=wait_for_connection,
fake=fake_with_ophyd_sim,
)


@skip_device(lambda: BL == "s03")
def vfm(
wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
Expand Down
8 changes: 0 additions & 8 deletions src/dodal/devices/qbpm1.py

This file was deleted.

10 changes: 5 additions & 5 deletions tests/common/beamlines/test_beamline_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from dodal.beamlines import i03
from dodal.common.beamlines import beamline_utils
from dodal.devices.aperturescatterguard import ApertureScatterguard
from dodal.devices.qbpm1 import QBPM1
from dodal.devices.eiger import EigerDetector
from dodal.devices.smargon import Smargon
from dodal.devices.zebra import Zebra
from dodal.log import LOGGER
Expand Down Expand Up @@ -65,11 +65,11 @@ def test_instantiating_different_device_with_same_name():


def test_instantiate_v1_function_fake_makes_fake():
qbpm: QBPM1 = beamline_utils.device_instantiation(
QBPM1, "qbpm", "", True, True, None
eiger: EigerDetector = beamline_utils.device_instantiation(
EigerDetector, "eiger", "", True, True, None
)
assert isinstance(qbpm, Device)
assert isinstance(qbpm.intensity, FakeEpicsSignal)
assert isinstance(eiger, Device)
assert isinstance(eiger.stale_params, FakeEpicsSignal)


def test_instantiate_v2_function_fake_makes_fake():
Expand Down

0 comments on commit 608d913

Please sign in to comment.