[WIP] P11 develop upgrade

mxcubecore/Command/Tango.py

@@ -28,11 +28,7 @@
     import queue
 
 
-from mxcubecore.CommandContainer import (
-    CommandObject,
-    ChannelObject,
-    ConnectionError,
-)
+from mxcubecore.CommandContainer import CommandObject, ChannelObject, ConnectionError
 from mxcubecore import Poller
 from mxcubecore.dispatcher import saferef
 import numpy
@@ -171,13 +167,13 @@ def __init__(
         self.timeout = int(timeout)
         self.read_as_str = kwargs.get("read_as_str", False)
         self._device_initialized = gevent.event.Event()
-        #logging.getLogger("HWR").debug(
+        # logging.getLogger("HWR").debug(
         #    "creating Tango attribute %s/%s, polling=%s, timeout=%d",
         #    self.device_name,
         #    self.attribute_name,
         #    polling,
         #    self.timeout,
-        #)
+        # )
         self.init_device()
         self.continue_init(None)
         """

mxcubecore/HardwareObjects/Beamline.py

@@ -240,8 +240,8 @@ def _get_id_dict_rec(
 
         return _path
 
-
     # Signal handling functions:
+
     def emit(self, signal: Union[str, object, Any], *args) -> None:
         """Emit signal. Accepts both multiple args and a single tuple of args.
 
@@ -291,7 +291,6 @@ def machine_info(self):
 
     __content_roles.append("machine_info")
 
-
     @property
     def authenticator(self):
         """Authenticator Hardware object
@@ -774,9 +773,9 @@ def get_default_acquisition_parameters(self, acquisition_type="default"):
 
         acq_parameters = queue_model_objects.AcquisitionParameters()
 
-        #logging.getLogger("HWR").debug(f"""
-            #Beamline object. Getting acquisition parameters for acquisition type {acquisition_type}
-        #""")
+        # logging.getLogger("HWR").debug(f"""
+        # Beamline object. Getting acquisition parameters for acquisition type {acquisition_type}
+        # """)
 
         params = self.default_acquisition_parameters["default"].copy()
         if acquisition_type != "default":
@@ -790,19 +789,17 @@ def get_default_acquisition_parameters(self, acquisition_type="default"):
 
                 params.update(dd0)
 
-        #logging.getLogger("HWR").debug(f"""
-              #params are {params}
-        #""")
+        # logging.getLogger("HWR").debug(f"""
+              # params are {params}
+        # """)
 
         for tag, val in params.items():
             setattr(acq_parameters, tag, val)
 
         motor_positions = self.diffractometer.get_positions()
-        osc_start = (
-            None
-            if not params["osc_start"]
-            else motor_positions.get("phi", params["osc_start"])
-        )
+
+        osc_start = params.get("osc_start") or motor_positions.get("phi")
+
         acq_parameters.osc_start = osc_start
         kappa = motor_positions.get("kappa", False)
         kappa = kappa if kappa else None

mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py

@@ -968,7 +968,7 @@ def _do_imagePolling(self, sleep_time):
                 # image.setOffset(QPoint(300,300))
                 # self.image = QPixmap.fromImage(image)
                 self.image = QPixmap.fromImage(
-                    image.scaled(self.display_width, self.display_height)
+                    image.scaled(int(self.display_width), int(self.display_height))
                 )
                 self.emit("imageReceived", self.image)
             # gevent.sleep(0.1)