Add Y to gonio

Author: olliesilvester

src/dodal/beamlines/i02_1.py

@@ -98,7 +98,7 @@ def s4_slit_gaps() -> Slits:
 
 @devices.factory(use_factory_name=False)
 def goniometer() -> SampleMotors:
-    return SampleMotors(f"{PREFIX.beamline_prefix}-MO-SAMP-01:", name="gonio")
+    return SampleMotors(f"{PREFIX.beamline_prefix}-MO-", name="gonio")
 
 
 @devices.factory()

src/dodal/devices/beamlines/i02_1/fast_grid_scan.py

@@ -34,7 +34,7 @@ def __init__(
         # See https://github.com/DiamondLightSource/mx-bluesky/issues/1203
         self.dwell_time_ms = epics_signal_rw_rbv(float, f"{full_prefix}EXPOSURE_TIME")
 
-        self.status = epics_signal_r(int, f"{prefix}SCAN_STATUS_RBV")
+        self.status = epics_signal_r(int, f"{full_prefix}SCAN_STATUS_RBV")
 
         self._movable_params["dwell_time_ms"] = self.dwell_time_ms
 

src/dodal/devices/beamlines/i02_1/sample_motors.py

@@ -13,7 +13,8 @@ def __init__(
         # See https://github.com/DiamondLightSource/mx-bluesky/issues/1212
         # regarding a potential motion issue with omega
         with self.add_children_as_readables():
-            self.x = Motor(f"{prefix}X")
-            self.z = Motor(f"{prefix}Z")
-            self.omega = Motor(f"{prefix}OMEGA")
+            self.x = Motor(f"{prefix}SAMP-01:X")
+            self.z = Motor(f"{prefix}SAMP-01:Z")
+            self.y = Motor(f"{prefix}GONJK-01:HEIGHT")
+            self.omega = Motor(f"{prefix}SAMP-01:OMEGA")
         super().__init__(name=name)