Update i09 branch id device names (#1968)

* Update i09 branch id device names

* Update i09-1 to use iundulator

* Updated more devices

* update i branch names

* fix

Author: oliwenmandiamond

src/dodal/beamlines/i09_1_shared.py

@@ -35,33 +35,34 @@ def dcm() -> DoubleCrystalMonochromatorWithDSpacing[
 
 
 @devices.factory()
-def undulator() -> UndulatorInMm:
+def iid() -> UndulatorInMm:
     return UndulatorInMm(prefix=f"{I_PREFIX.insertion_prefix}-MO-SERVC-01:")
 
 
 @devices.factory()
-def harmonics() -> UndulatorOrder:
+def ienergy_order() -> UndulatorOrder:
     return UndulatorOrder()
 
 
 @devices.factory()
-def hu_id_energy(
-    harmonics: UndulatorOrder, undulator: UndulatorInMm
+def iidenergy(
+    ienergy_order: UndulatorOrder, iid: UndulatorInMm
 ) -> HardInsertionDeviceEnergy:
     return HardInsertionDeviceEnergy(
-        undulator_order=harmonics,
-        undulator=undulator,
+        undulator_order=ienergy_order,
+        undulator=iid,
         lut={},  # ToDo https://github.com/DiamondLightSource/sm-bluesky/issues/239
         gap_to_energy_func=calculate_energy_i09_hu,
         energy_to_gap_func=calculate_gap_i09_hu,
     )
 
 
 @devices.factory()
-def hu_energy(
-    dcm: DoubleCrystalMonochromatorWithDSpacing, hu_id_energy: HardInsertionDeviceEnergy
+def ienergy(
+    dcm: DoubleCrystalMonochromatorWithDSpacing,
+    iidenergy: HardInsertionDeviceEnergy,
 ) -> HardEnergy:
     return HardEnergy(
         dcm=dcm,
-        undulator_energy=hu_id_energy,
+        undulator_energy=iidenergy,
     )

src/dodal/beamlines/i09_2_shared.py

@@ -51,12 +51,12 @@ def pgm() -> PlaneGratingMonochromator:
 
 
 @devices.factory()
-def jid_gap() -> UndulatorGap:
+def jgap() -> UndulatorGap:
     return UndulatorGap(prefix=f"{J_PREFIX.insertion_prefix}-MO-SERVC-01:")
 
 
 @devices.factory()
-def jid_phase() -> UndulatorPhaseAxes:
+def jphase() -> UndulatorPhaseAxes:
     return UndulatorPhaseAxes(
         prefix=f"{J_PREFIX.insertion_prefix}-MO-SERVC-01:",
         top_outer="PUO",
@@ -67,15 +67,13 @@ def jid_phase() -> UndulatorPhaseAxes:
 
 
 @devices.factory()
-def jid(
-    jid_gap: UndulatorGap, jid_phase: UndulatorPhaseAxes
-) -> Apple2[UndulatorPhaseAxes]:
+def jid(jgap: UndulatorGap, jphase: UndulatorPhaseAxes) -> Apple2[UndulatorPhaseAxes]:
     """I09 soft x-ray insertion device."""
-    return Apple2[UndulatorPhaseAxes](id_gap=jid_gap, id_phase=jid_phase)
+    return Apple2[UndulatorPhaseAxes](id_gap=jgap, id_phase=jphase)
 
 
 @devices.factory()
-def jid_controller(
+def jidcontroller(
     jid: Apple2[UndulatorPhaseAxes],
 ) -> Apple2EnforceLHMoveController[UndulatorPhaseAxes]:
     """J09 insertion device controller."""
@@ -96,22 +94,22 @@ def jid_controller(
 
 
 @devices.factory()
-def jid_energy(
-    jid_controller: Apple2EnforceLHMoveController[UndulatorPhaseAxes],
+def jidenergy(
+    jidcontroller: Apple2EnforceLHMoveController[UndulatorPhaseAxes],
 ) -> InsertionDeviceEnergy:
-    return InsertionDeviceEnergy(id_controller=jid_controller)
+    return InsertionDeviceEnergy(id_controller=jidcontroller)
 
 
 @devices.factory()
-def jid_polarisation(
-    jid_controller: Apple2EnforceLHMoveController[UndulatorPhaseAxes],
+def jpolarisation(
+    jidcontroller: Apple2EnforceLHMoveController[UndulatorPhaseAxes],
 ) -> InsertionDevicePolarisation:
-    return InsertionDevicePolarisation(id_controller=jid_controller)
+    return InsertionDevicePolarisation(id_controller=jidcontroller)
 
 
 @devices.factory()
-def energy_jid(
-    jid_energy: InsertionDeviceEnergy, pgm: PlaneGratingMonochromator
+def jenergy(
+    jidenergy: InsertionDeviceEnergy, pgm: PlaneGratingMonochromator
 ) -> BeamEnergy:
     """Beam energy."""
-    return BeamEnergy(id_energy=jid_energy, mono=pgm.energy)
+    return BeamEnergy(id_energy=jidenergy, mono=pgm.energy)