Skip to content

Commit

Permalink
Change from code review: added simulated pump to p38.
Browse files Browse the repository at this point in the history
  • Loading branch information
barnettwilliam committed Jun 3, 2024
1 parent 6d5ae3f commit d21684d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/dodal/beamlines/i22.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def linkam(


def ppump(
wait_for_connection: bool = True, fake_with_ophyd_sim: bool = True
wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
) -> WatsonMarlow323Pump:
"""Sample Environment Peristaltic Pump"""
return device_instantiation(
Expand Down
14 changes: 14 additions & 0 deletions src/dodal/beamlines/p38.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from dodal.devices.slits import Slits
from dodal.devices.tetramm import TetrammDetector
from dodal.devices.undulator import Undulator
from dodal.devices.watsonmarlow323_pump import WatsonMarlow323Pump
from dodal.log import set_beamline as set_log_beamline
from dodal.utils import BeamlinePrefix, get_beamline_name, skip_device

Expand Down Expand Up @@ -289,3 +290,16 @@ def linkam(
wait_for_connection,
fake_with_ophyd_sim,
)


def ppump(
wait_for_connection: bool = True, fake_with_ophyd_sim: bool = True
) -> WatsonMarlow323Pump:
"""Peristaltic Pump"""
return device_instantiation(
WatsonMarlow323Pump,
"ppump",
"-EA-PUMP-01:",
wait_for_connection,
fake_with_ophyd_sim,
)

0 comments on commit d21684d

Please sign in to comment.