Size is in mm

mxcube · Aug 20, 2024 · a186472 · a186472
1 parent 298e568
commit a186472
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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"