(DiamondLightSource/hyperion#1032) Some tidying up from review

olliesilvester · Mar 6, 2024 · a648eee · a648eee
1 parent 89ee1d5
commit a648eee
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ __pycache__/ @@
     # C extensions
     *.so
-    Makefile
     # Output
     *.png
@@ Expand Down @@