add_i09_hu_lut_converter

Author: eir17846

src/daq_config_server/models/converters/_file_converter_map.py

@@ -13,6 +13,7 @@
     beamline_pitch_lut,
     beamline_roll_lut,
     detector_xy_lut,
+    i09_hu_undulator_energy_gap_lut,
     undulator_energy_gap_lut,
 )
 
@@ -40,5 +41,5 @@
     "/dls_sw/i03/software/daq_configuration/lookup/BeamLineEnergy_DCM_Pitch_converter.txt": beamline_pitch_lut,  # noqa
     "/dls_sw/i03/software/daq_configuration/lookup/BeamLineEnergy_DCM_Roll_converter.txt": beamline_roll_lut,  # noqa
     "/dls_sw/i03/software/daq_configuration/lookup/BeamLine_Undulator_toGap.txt": undulator_energy_gap_lut,  # noqa
-    "IIDCalibrationTable.txt": undulator_energy_gap_lut,  # noga
+    "IIDCalibrationTable.txt": i09_hu_undulator_energy_gap_lut,  # noga
 }

src/daq_config_server/models/converters/convert.py

@@ -14,7 +14,6 @@ def get_converted_file_contents(file_path: Path) -> dict[str, Any]:
     if converter := file_converter_map.FILE_TO_CONVERTER_MAP.get(str(file_path)):
         try:
             contents = converter(raw_contents)
-            raise TypeError(contents)
             if isinstance(contents, ConfigModel):
                 return contents.model_dump()
             return contents

src/daq_config_server/models/converters/lookup_tables/__init__.py

@@ -2,6 +2,7 @@
     beamline_pitch_lut,
     beamline_roll_lut,
     detector_xy_lut,
+    i09_hu_undulator_energy_gap_lut,
     undulator_energy_gap_lut,
 )
 from ._models import GenericLookupTable
@@ -12,4 +13,5 @@
     "beamline_pitch_lut",
     "beamline_roll_lut",
     "undulator_energy_gap_lut",
+    "i09_hu_undulator_energy_gap_lut",
 ]

src/daq_config_server/models/converters/lookup_tables/_converters.py

@@ -4,6 +4,8 @@
 
 from ._models import GenericLookupTable
 
+ignore_lines_starting_with = ("Units", "ScannableUnits", "ScannableNames")
+
 
 def parse_lut(contents: str, *params: tuple[str, type | None]) -> GenericLookupTable:
     """Converts a lookup table to a pydantic model, containing the names of each column
@@ -18,7 +20,7 @@ def parse_lut(contents: str, *params: tuple[str, type | None]) -> GenericLookupT
     column_names = [param[0] for param in params]
     types = [param[1] for param in params]
     for line in remove_comments(contents.splitlines()):
-        if line.startswith("Units") or line.startswith("ScannableUnits"):
+        if line.startswith(ignore_lines_starting_with):
             continue
         rows.append(
             [parse_value(value, types[i]) for i, value in enumerate(line.split())]
@@ -45,3 +47,17 @@ def beamline_roll_lut(contents: str) -> GenericLookupTable:
 
 def undulator_energy_gap_lut(contents: str) -> GenericLookupTable:
     return parse_lut(contents, ("energy_eV", int), ("gap_mm", float))
+
+
+def i09_hu_undulator_energy_gap_lut(contents: str) -> GenericLookupTable:
+    return parse_lut(
+        contents,
+        ("order", int),
+        ("ring_energy_gev", float),
+        ("magnetic_field_t", float),
+        ("energy_min_eV", float),
+        ("energy_max_eV", float),
+        ("gap_min_mm", float),
+        ("gap_max_mm", float),
+        ("gap_offset_mm", float),
+    )

tests/constants.py

@@ -34,6 +34,8 @@ class TestDataPaths:
 
     TEST_BAD_LUT_PATH = TEST_DATA_DIR_PATH.joinpath("test_bad_lut.txt")
 
+    TEST_I09_HU_LUT_PATH = TEST_DATA_DIR_PATH.joinpath("test_i09_hu_lut.txt")
+
     TEST_GOOD_DISPLAY_CONFIG_PATH = TEST_DATA_DIR_PATH.joinpath(
         "test_display.configuration"
     )
@@ -53,6 +55,7 @@ class ServerFilePaths:
     BAD_JSON_FILE = Path("/tests/test_data/test_bad_json")
     FILE_IN_GOOD_DIR = Path("/tests/test_data/test_bad_json")
     GOOD_LUT = Path("/tests/test_data/test_good_lut.txt")
+    I09_HU_LUT = Path("/tests/test_data/test_i09_hu_lut.txt")
 
 
 TEST_CONFIG_PATH = TEST_DATA_DIR_PATH.joinpath("test_config.yaml")
@@ -63,6 +66,7 @@ class ServerFilePaths:
   - {TestDataPaths.TEST_BAD_JSON_PATH}
   - {TestDataPaths.TEST_BEAMLINE_PARAMETERS_PATH}
   - {TestDataPaths.TEST_INVALID_FILE_PATH}
+  - {TestDataPaths.TEST_I09_HU_LUT_PATH}
 
 whitelist_dirs:
   - {TEST_DATA_DIR_PATH.joinpath("good_dir")}

IIDCalibrationTable.txt tests/test_data/test_i09_hu_lut.txtIIDCalibrationTable.txt renamed to tests/test_data/test_i09_hu_lut.txt

@@ -6,6 +6,7 @@
     beamline_pitch_lut,
     beamline_roll_lut,
     detector_xy_lut,
+    i09_hu_undulator_energy_gap_lut,
     undulator_energy_gap_lut,
 )
 from daq_config_server.models.converters.lookup_tables._converters import parse_lut
@@ -113,3 +114,31 @@ def test_undulator_gap_lut_gives_expected_result():
     )
     result = undulator_energy_gap_lut(input)
     assert result == expected
+
+
+def test_i09_hu_undulator_gap_lut_gives_expected_result():
+    input = (
+        "#I09 Hard X-ray ID calibration parameters, created 18 July 2012\n"
+        "ScannableNames	n	Ee	Br	Epmin	Epmax	Gmin	Gmax	Goffset\n"
+        "ScannableUnits	ONE	GeV	T	KeV	Kev	mm	mm\n"
+        "1	3.00089	0.98928	2.12	3.05	14.2650	23.7200	0.0\n"
+        "2	3.04129	1.02504	2.50	2.80	5.05165	8.88007	0.0\n"
+    )
+    expected = GenericLookupTable(
+        column_names=[
+            "order",
+            "ring_energy_gev",
+            "magnetic_field_t",
+            "energy_min_eV",
+            "energy_max_eV",
+            "gap_min_mm",
+            "gap_max_mm",
+            "gap_offset_mm",
+        ],
+        rows=[
+            [1, 3.00089, 0.98928, 2.12, 3.05, 14.2650, 23.7200, 0.0],
+            [2, 3.04129, 1.02504, 2.50, 2.80, 5.05165, 8.88007, 0.0],
+        ],
+    )
+    result = i09_hu_undulator_energy_gap_lut(input)
+    assert result == expected