Merge pull request #1361 from DiamondLightSource/1343_fix_v9.2.0

Hotfixes for v9.2.0
DiamondLightSource · May 16, 2024 · c93404a · c93404a
2 parents 0869a3c + bde57f8
commit c93404a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -33,7 +33,7 @@ install_requires =
     xarray
     doct
     databroker
-    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git
+    dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@370f549f5471e3477606afec3469707c79da532c
     pydantic<2.0 # See https://github.com/DiamondLightSource/hyperion/issues/774
     scipy
     pyzmq

diff --git a/src/hyperion/parameters/components.py b/src/hyperion/parameters/components.py
@@ -159,7 +159,7 @@ def visit_directory(self) -> Path:
 
     @property
     def snapshot_directory(self) -> Path:
-        return self.visit_directory / "snapshots"
+        return Path(self.storage_directory) / "snapshots"
 
     @property
     def num_images(self) -> int:

diff --git a/src/hyperion/parameters/gridscan.py b/src/hyperion/parameters/gridscan.py
@@ -106,7 +106,7 @@ def detector_params(self):
             omega_increment=0,
             num_images_per_trigger=1,
             num_triggers=self.num_images,
-            use_roi_mode=False,
+            use_roi_mode=self.use_roi_mode,
             det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
             trigger_mode=self.trigger_mode,
             beam_xy_converter=DetectorDistanceToBeamXYConverter(

diff --git a/tests/unit_tests/parameters/test_parameter_model.py b/tests/unit_tests/parameters/test_parameter_model.py
@@ -231,7 +231,7 @@ def test_pin_then_xray(self):
             },
             "experiment_params": {
                 "transmission_fraction": self.transmission,
-                "snapshot_dir": "/tmp/dls/i03/data/2024/cm66666-6/snapshots",
+                "snapshot_dir": f"{self.directory}snapshots",
                 "detector_distance": self.detector_distance_mm,
                 "exposure_time": self.exposure_time_s,
                 "omega_start": self.omega_start,