Add parameter to toggle zocalo using GPU results

DiamondLightSource · Aug 29, 2024 · 2fd3921 · 2fd3921
1 parent 3f33513
commit 2fd3921
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/hyperion/experiment_plans/flyscan_xray_centre_plan.py b/src/hyperion/experiment_plans/flyscan_xray_centre_plan.py
@@ -129,6 +129,7 @@ def flyscan_xray_centre(
  """
  parameters.features.update_self_from_server()
  composite.eiger.set_detector_parameters(parameters.detector_params)
+ composite.zocalo.use_fastest_zocalo_result = parameters.use_fastest_zocalo_result
  composite.zocalo.zocalo_environment = parameters.zocalo_environment
 
  feature_controlled = _get_feature_controlled(composite, parameters)

diff --git a/src/hyperion/parameters/constants.py b/src/hyperion/parameters/constants.py
@@ -106,6 +106,7 @@ class I03Constants:
  SHUTTER_TIME_S = 0.06
  USE_PANDA_FOR_GRIDSCAN = False
  USE_GPU_FOR_GRIDSCAN_ANALYSIS = False
+ USE_FASTEST_ZOCALO_RESULT = False
  THAWING_TIME = 20
 
 

diff --git a/src/hyperion/parameters/gridscan.py b/src/hyperion/parameters/gridscan.py
@@ -40,7 +40,11 @@ class GridCommon(
  default=CONST.HARDWARE.PANDA_FGS_RUN_UP_DEFAULT
  )
  use_panda: bool = Field(default=CONST.I03.USE_PANDA_FOR_GRIDSCAN)
+
  use_gpu: bool = Field(default=CONST.I03.USE_GPU_FOR_GRIDSCAN_ANALYSIS)
+
+ use_fastest_zocalo_result: bool = Field(default=CONST.I03.USE_FASTEST_ZOCALO_RESULT)
+
  ispyb_experiment_type: IspybExperimentType = Field(
  default=IspybExperimentType.GRIDSCAN_3D
  )