partial update

DiamondLightSource · Oct 23, 2024 · 1cd0302 · 1cd0302
1 parent cafadb6
commit 1cd0302
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/dodal/beamlines/adsim.py b/src/dodal/beamlines/adsim.py
@@ -9,18 +9,18 @@
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
-from dodal.devices.adsim import SimStage
+from dodal.devices.adsim.simstage import SimStage
 from dodal.log import set_beamline as set_log_beamline
-from dodal.utils import get_hostname
+from dodal.utils import get_beamline_name
 
-BL = get_hostname()
+BL = get_beamline_name("bl01t")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
 set_path_provider(
     StaticVisitPathProvider(
         BL,
-        Path("/scratch/adsim/bluesky"),
+        Path("/dev/null"),
         client=LocalDirectoryServiceClient(),
     )
 )
@@ -83,11 +83,11 @@ def adsim(
     return device_instantiation(
         SimDetector,
         "adsim",
-        BL + "-AD-SIM-01:",
+        BL + "-DI-CAM-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
-        drv_suffix="CAM:",
-        hdf_suffix="HDF5:",
+        drv_suffix="DET:",
+        hdf_suffix="HDF:",
         path_provider=get_path_provider(),
         bl_prefix=False,
     )
diff --git a/src/dodal/devices/adsim.py → src/dodal/devices/adsim/simstage.py b/src/dodal/devices/adsim.py → src/dodal/devices/adsim/simstage.py
@@ -9,7 +9,4 @@ def __init__(self, prefix: str, name: str = "sim"):
         with self.add_children_as_readables():
             self.x = Motor(prefix + "M1")
             self.y = Motor(prefix + "M2")
-            self.z = Motor(prefix + "M3")
-            self.theta = Motor(prefix + "M4")
-            self.load = Motor(prefix + "M5")
         super().__init__(name=name)