Merge pull request #66 from DiamondLightSource/moving-from-120-1-to-p51

Moving from 120 1 to p51

Author: subughimire420

README.md

@@ -7,7 +7,7 @@
 
 Plans to use at spectroscopy beamlines at DLS
 
-Currently the `scan_runner` tool is available to run some tests scans in I20-1's turbo slits.
+Currently the `scan_runner` tool is available to run some tests scans in p51's turbo slits.
 
 In order to run the scans you'll first need to install the repository into a virtual environment:
 
@@ -18,10 +18,10 @@ pip install --upgrade pip
 pip install -e .
 ```
 
-It's important to remember that due to network isolation, in order to run the scans you'll need to access a machine that's currently connected to I20-1's network. This can be done by:
+It's important to remember that due to network isolation, in order to run the scans you'll need to access a machine that's currently connected to p51's network. This can be done by:
 
 ```bash
-ssh i20-1-ws002
+ssh p51-ws002
 ```
 
 if you already have the environment installed you can just source otherwise you'll need to install it (steps above).

scan_runner.py

@@ -2,10 +2,10 @@
 
 import typer
 from bluesky import RunEngine
-from dodal.beamlines.i20_1 import panda, turbo_slit
+from dodal.beamlines.p51 import panda, turbo_slit
 from ophyd_async.plan_stubs import ensure_connected
 
-from spectroscopy_bluesky.i20_1.plans.direct_turbo_slit_movement import (
+from spectroscopy_bluesky.p51.plans.direct_turbo_slit_movement import (
     fly_sweep_both_ways,
     seq_non_linear,
     seq_table,

src/spectroscopy_bluesky/common/panda_data_socket.py

@@ -103,5 +103,5 @@ def get_frame(self, frame_index):
             return self.all_data[frame_index]
 
 
-panda_socket = DataSocket("bl20j-ts-panda-02", 8889)
+panda_socket = DataSocket("bl51p-ts-panda-02", 8889)
 panda_socket.connect()

…c/spectroscopy_bluesky/i20_1/__init__.py src/spectroscopy_bluesky/p51/__init__.pysrc/spectroscopy_bluesky/i20_1/__init__.py renamed to src/spectroscopy_bluesky/p51/__init__.py src/spectroscopy_bluesky/i20_1/__init__.py renamed to src/spectroscopy_bluesky/p51/__init__.py

@@ -7,7 +7,7 @@
 import numpy as np
 from aioca import caput
 from bluesky.utils import MsgGenerator
-from dodal.beamlines.i20_1 import turbo_slit_pmac
+from dodal.beamlines.p51 import turbo_slit_pmac
 from dodal.common.coordination import inject
 from dodal.plan_stubs.data_session import attach_data_session_metadata_decorator
 from numpy.typing import NDArray
@@ -80,7 +80,7 @@ async def kickoff(self) -> None:
         await wait_for_value(self.pcomp.active, True, timeout=1)
 
     async def prepare(self, value: PcompInfo) -> None:
-        await caput("BL20J-EA-PANDA-02:SRGATE1:FORCE_RST", "1", wait=True)
+        await caput("BL51P-EA-PANDA-02:SRGATE1:FORCE_RST", "1", wait=True)
         await asyncio.gather(
             self.pcomp.start.set(value.start_postion),
             self.pcomp.width.set(value.pulse_width),
@@ -119,7 +119,7 @@ def get_pcomp_info(width, start_pos, direction_of_sweep: PandaPcompDirection, nu
     return panda_pcomp_info
 
 
-def setup_trajectory_scan_pvs(prefix: str = "BL20J-MO-STEP-06"):
+def setup_trajectory_scan_pvs(prefix: str = "BL51P-MO-STEP-06"):
     """
     Set PV values on trajectory scan controller needed for scan to work
     (axis label to X, and profile name to PMAC6CS3)
@@ -557,12 +557,12 @@ def inner_plan():
 
 
 def plan_store_settings(panda: HDFPanda, name: str):
-    provider = YamlSettingsProvider("./src/spectroscopy_bluesky/i20_1/layouts")
+    provider = YamlSettingsProvider("./src/spectroscopy_bluesky/p51/layouts")
     yield from store_settings(provider, name, panda)
 
 
 def plan_restore_settings(panda: HDFPanda, name: str):
     print(f"\nrestoring {name} layout\n")
-    provider = YamlSettingsProvider("./src/spectroscopy_bluesky/i20_1/layouts")
+    provider = YamlSettingsProvider("./src/spectroscopy_bluesky/p51/layouts")
     settings = yield from retrieve_settings(provider, name, panda)
     yield from apply_panda_settings(settings)