From a186472ccab0839302ae8fe9eba04215549c75ca Mon Sep 17 00:00:00 2001 From: Antonia Beteva Date: Tue, 20 Aug 2024 17:18:43 +0200 Subject: [PATCH] Size is in mm --- mxcubecore/HardwareObjects/mockup/BeamMockup.py | 5 ++++- test/pytest/test_beam.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mxcubecore/HardwareObjects/mockup/BeamMockup.py b/mxcubecore/HardwareObjects/mockup/BeamMockup.py index 3d44ab6dd9..c7d4324f86 100644 --- a/mxcubecore/HardwareObjects/mockup/BeamMockup.py +++ b/mxcubecore/HardwareObjects/mockup/BeamMockup.py @@ -231,7 +231,10 @@ def get_defined_beam_size(self): _nam = value.name if _nam not in ["IN", "OUT", "UNKNOWN"]: labels.append(_nam) - values.append(value.value) + if self._definer_type == "aperture": + values.append((value.value[0]/1000., value.value[0]/1000.)) + else: + values.append(value.value) return {"label": labels, "size": values} def get_available_size(self): diff --git a/test/pytest/test_beam.py b/test/pytest/test_beam.py index 7ee3056fd7..33a04ae793 100644 --- a/test/pytest/test_beam.py +++ b/test/pytest/test_beam.py @@ -84,6 +84,9 @@ def test_get_defined_beam_size(self, test_object): _vals = test_object.get_defined_beam_size() _list = test_object.aperture.get_diameter_size_list() assert _vals["label"] == _list + for val in _vals["size"]: + assert isinstance(val, tuple) + assert val[0] == val[1] if test_object.slits: test_object._definer_type = "slits"