P11 develop

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

@@ -798,11 +798,9 @@ def get_default_acquisition_parameters(self, acquisition_type="default"):
             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 = motor_positions.get("phi", params["osc_start"])
+
         acq_parameters.osc_start = osc_start
         kappa = motor_positions.get("kappa", False)
         kappa = kappa if kappa else None

mxcubecore/HardwareObjects/DESY/P11AlbulaView.py

@@ -26,7 +26,6 @@
 import time
 from PIL import Image
 
-
 sys.path.append("/opt/dectris/albula/4.0/python/")
 
 from mxcubecore.BaseHardwareObjects import HardwareObject