From a648eeee95173f123a217b94528d79e581fdb302 Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Wed, 6 Mar 2024 15:39:44 +0000 Subject: [PATCH] (DiamondLightSource/hyperion#1032) Some tidying up from review --- .gitignore | 1 - src/hyperion/device_setup_plans/read_hardware_for_setup.py | 2 +- src/hyperion/external_interaction/ispyb/ispyb_dataclass.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f1e79bb5..7becea822 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ __pycache__/ # C extensions *.so -Makefile # Output *.png diff --git a/src/hyperion/device_setup_plans/read_hardware_for_setup.py b/src/hyperion/device_setup_plans/read_hardware_for_setup.py index 3797f8397..356e84f60 100644 --- a/src/hyperion/device_setup_plans/read_hardware_for_setup.py +++ b/src/hyperion/device_setup_plans/read_hardware_for_setup.py @@ -32,7 +32,7 @@ def read_hardware_for_ispyb_pre_collection( yield from bps.read(synchrotron.machine_status.synchrotron_mode) yield from bps.read(s4_slit_gaps.xgap) yield from bps.read(s4_slit_gaps.ygap) - yield from bps.read(aperture_scatterguard.selected_aperture) + yield from bps.read(aperture_scatterguard) yield from bps.read(robot.barcode) yield from bps.save() diff --git a/src/hyperion/external_interaction/ispyb/ispyb_dataclass.py b/src/hyperion/external_interaction/ispyb/ispyb_dataclass.py index 8901a2090..1c9578b96 100644 --- a/src/hyperion/external_interaction/ispyb/ispyb_dataclass.py +++ b/src/hyperion/external_interaction/ispyb/ispyb_dataclass.py @@ -55,7 +55,6 @@ class IspybParams(BaseModel): sample_barcode: Optional[str] = None # Optional from GDA as populated by Ophyd - aperture_name: Optional[str] = None flux: Optional[float] = None undulator_gap: Optional[float] = None synchrotron_mode: Optional[str] = None