fix imports again

DiamondLightSource · Oct 28, 2024 · 0414e0e · 0414e0e
1 parent 3b89f4c
commit 0414e0e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/src/dodal/beamlines/i18.py b/src/dodal/beamlines/i18.py
@@ -134,11 +134,22 @@ def xspress3_odin(
     )
 
 
-crystal_1_metadata = CrystalMetadata("Si111")
-crystal_2_metadata = CrystalMetadata("Si111")
-
-_unused_crystal_metadata_1 = CrystalMetadata("Si311")
-_unused_crystal_metadata_2 = CrystalMetadata("Si333")
+crystal_1_metadata = (
+    CrystalMetadata(
+        usage="Bragg",
+        type="silicon",
+        reflection=(1, 1, 1),
+        d_spacing=(3.13475, "nm"),
+    ),
+)
+crystal_2_metadata = (
+    CrystalMetadata(
+        usage="Bragg",
+        type="silicon",
+        reflection=(1, 1, 1),
+        d_spacing=(3.13475, "nm"),
+    ),
+)
 
 
 def dcm(

diff --git a/src/dodal/devices/i22/dcm.py b/src/dodal/devices/i22/dcm.py
@@ -9,8 +9,6 @@
 from ophyd_async.epics.motor import Motor
 from ophyd_async.epics.signal import epics_signal_r
 
-from dodal.common.crystal_metadata import CrystalMetadata
-
 # Conversion constant for energy and wavelength, taken from the X-Ray data booklet
 # Converts between energy in KeV and wavelength in angstrom
 _CONVERSION_CONSTANT = 12.3984