From 620121b777f2a08d3438f9239177d98274134c3b Mon Sep 17 00:00:00 2001
From: rhfogh <rhfogh@globalphasing.com>
Date: Thu, 3 Oct 2024 11:31:11 +0100
Subject: [PATCH] Code improvements for previous commit

---
 mxcubecore/HardwareObjects/DESY/P11Collect.py          | 3 ++-
 mxcubecore/HardwareObjects/abstract/AbstractCollect.py | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mxcubecore/HardwareObjects/DESY/P11Collect.py b/mxcubecore/HardwareObjects/DESY/P11Collect.py
index 09c30e6ef2..2c95b2704f 100644
--- a/mxcubecore/HardwareObjects/DESY/P11Collect.py
+++ b/mxcubecore/HardwareObjects/DESY/P11Collect.py
@@ -26,6 +26,7 @@
 import time
 import sys
 import os
+import math
 import logging
 import traceback
 import h5py
@@ -115,7 +116,7 @@ def set_resolution(self, value):
         Args:
             value (float): Resolution value to set.
         """
-        if round(HWR.beamline.resolution.get_value(), 2) != round(value, 2):
+        if math.isclose(HWR.beamline.resolution.get_value(), value, abs_tol=0.01):
             super().set_resolution(value)
 
     def data_collection_hook(self):
diff --git a/mxcubecore/HardwareObjects/abstract/AbstractCollect.py b/mxcubecore/HardwareObjects/abstract/AbstractCollect.py
index 17a5af3c1c..31fe8fe17c 100644
--- a/mxcubecore/HardwareObjects/abstract/AbstractCollect.py
+++ b/mxcubecore/HardwareObjects/abstract/AbstractCollect.py
@@ -223,11 +223,10 @@ def do_collect(self, owner):
             wavelength = self.current_dc_parameters.get("wavelength")
             energy = self.current_dc_parameters.get("energy")
             detector_distance = self.current_dc_parameters.get("detector_distance")
-            dd0 = self.current_dc_parameters.get("resolution")
-            if dd0 and dd0.get('upper'):
-                resolution = dd0["upper"]
-            else:
-                resolution = None
+            try:
+               resolution = self.current_dc_parameters.get("resolution").get("upper")
+            except AttributeError:
+               resolution = None
 
             if wavelength:
                 # Wavelength (not having a default) overrides energy