From 38c85fb802f12a84defb37c5bcb1accc48a98486 Mon Sep 17 00:00:00 2001 From: David Perl Date: Tue, 14 May 2024 15:16:29 +0100 Subject: [PATCH] (#1289) address review comment --- .../robot_load_then_centre_plan.py | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/hyperion/experiment_plans/robot_load_then_centre_plan.py b/src/hyperion/experiment_plans/robot_load_then_centre_plan.py index 6b325b0c0..a58953623 100644 --- a/src/hyperion/experiment_plans/robot_load_then_centre_plan.py +++ b/src/hyperion/experiment_plans/robot_load_then_centre_plan.py @@ -12,6 +12,7 @@ from dodal.devices.attenuator import Attenuator from dodal.devices.backlight import Backlight from dodal.devices.dcm import DCM +from dodal.devices.detector.det_resolution import resolution from dodal.devices.detector.detector_motion import DetectorMotion from dodal.devices.eiger import EigerDetector from dodal.devices.fast_grid_scan import FastGridScan @@ -171,10 +172,7 @@ def robot_load(): assert params.sample_pin is not None yield from bps.abs_set( composite.robot, - SampleLocation( - params.sample_puck, - params.sample_pin, - ), + SampleLocation(params.sample_puck, params.sample_pin), group="robot_load", ) @@ -214,18 +212,14 @@ def robot_load(): def _get_updated_parameters_for_pin_and_xray( params: RobotLoadThenCentre, composite: RobotLoadThenCentreComposite ): - current_energy_ev = 1000 * ( + use_energy = params.demand_energy_ev or 1000 * ( yield from read_energy(cast(SetEnergyComposite, composite)) ) - use_energy = params.demand_energy_ev or current_energy_ev - - wavelength_angstroms = convert_eV_to_angstrom(use_energy) - use_resolution = resolution( - params.detector_params, - wavelength_angstroms, - params.detector_distance_mm - or (yield from bps.rd(composite.detector_motion.z.user_readback)), + det_dist = params.detector_distance_mm or ( + yield from bps.rd(composite.detector_motion.z.user_readback) ) + wavelength_angstroms = convert_eV_to_angstrom(use_energy) + use_resolution = resolution(params.detector_params, wavelength_angstroms, det_dist) return use_energy, use_resolution