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

Commit

Permalink
(#1289) address review comment
Browse files Browse the repository at this point in the history
  • Loading branch information
dperl-dls committed May 14, 2024
1 parent 90f6c0b commit 38c85fb
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions src/hyperion/experiment_plans/robot_load_then_centre_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
)

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 38c85fb

Please sign in to comment.