Merge pull request DiamondLightSource/hyperion#1203 from DiamondLight…

…Source/remove_unused_params Removed unused parameters and fixed some typing
olliesilvester · Mar 1, 2024 · 9efe778 · 9efe778
2 parents d595bc3 + de28699
commit 9efe778
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -35,7 +35,7 @@ install_requires =
     xarray
     doct
     databroker
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@f7dad0203d3d801df498ec1b2ee3d56945d15aab
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@a5228493da48b24a09bb9ff2d1fd1ef8c69d8c71
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
     pyzmq<25 # See https://github.com/DiamondLightSource/hyperion/issues/1103

diff --git a/src/hyperion/external_interaction/nexus/write_nexus.py b/src/hyperion/external_interaction/nexus/write_nexus.py
@@ -20,7 +20,10 @@
     create_goniometer_axes,
     get_start_and_predicted_end_time,
 )
-from hyperion.parameters.internal_parameters import InternalParameters
+from hyperion.parameters.internal_parameters import (
+    HyperionParameters,
+    InternalParameters,
+)
 
 
 class NexusWriter:
@@ -35,35 +38,33 @@ def __init__(
     ) -> None:
         self.scan_points: dict = scan_points
         self.data_shape: tuple[int, int, int] = data_shape
+        hyperion_parameters: HyperionParameters = (
+            parameters.hyperion_params  # type:ignore
+        )
         self.omega_start: float = (
             omega_start
             if omega_start
-            else parameters.hyperion_params.detector_params.omega_start
+            else hyperion_parameters.detector_params.omega_start
         )
+        assert hyperion_parameters.detector_params.run_number is not None
         self.run_number: int = (
-            run_number
-            if run_number
-            else parameters.hyperion_params.detector_params.run_number
+            run_number if run_number else hyperion_parameters.detector_params.run_number
         )
         self.detector: Detector = create_detector_parameters(
-            parameters.hyperion_params.detector_params
+            hyperion_parameters.detector_params
         )
         self.beam, self.attenuator = create_beam_and_attenuator_parameters(
-            parameters.hyperion_params.ispyb_params
+            hyperion_parameters.ispyb_params
         )
         self.source: Source = Source(get_beamline_name("S03"))
-        self.directory: Path = Path(
-            parameters.hyperion_params.detector_params.directory
-        )
-        self.filename: str = parameters.hyperion_params.detector_params.prefix
+        self.directory: Path = Path(hyperion_parameters.detector_params.directory)
+        self.filename: str = hyperion_parameters.detector_params.prefix
         self.start_index: int = vds_start_index
         self.full_num_of_images: int = (
-            parameters.hyperion_params.detector_params.num_triggers
-            * parameters.hyperion_params.detector_params.num_images_per_trigger
-        )
-        self.full_filename: str = (
-            parameters.hyperion_params.detector_params.full_filename
+            hyperion_parameters.detector_params.num_triggers
+            * hyperion_parameters.detector_params.num_images_per_trigger
         )
+        self.full_filename: str = hyperion_parameters.detector_params.full_filename
         self.nexus_file: Path = (
             self.directory / f"{self.filename}_{self.run_number}.nxs"
         )

diff --git a/tests/test_data/hyperion_parameters.json b/tests/test_data/hyperion_parameters.json
@@ -18,9 +18,7 @@
         "det_dist_to_beam_converter_path": "tests/test_data/test_lookup_table.txt",
         "trigger_mode": 2,
         "detector_size_constants": "EIGER2_X_16M",
-        "beam_xy_converter": null,
-        "start_index": 0,
-        "nexus_file_run_number": 0
+        "beam_xy_converter": null
     },
     "ispyb_params": {
         "visit_path": "/tmp/cm31105-4/",