Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Add parameter to toggle zocalo using GPU results #1548

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/hyperion/experiment_plans/flyscan_xray_centre_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/hyperion/parameters/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
4 changes: 4 additions & 0 deletions src/hyperion/parameters/gridscan.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor Author

@olliesilvester olliesilvester Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably go into the config service at some point


ispyb_experiment_type: IspybExperimentType = Field(
default=IspybExperimentType.GRIDSCAN_3D
)
Expand Down
Loading