mxcubecore 1.394.0__py3-none-any.whl → 1.396.0__py3-none-any.whl

mxcubecore/Command/Sardana.py

@@ -181,9 +181,6 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
         try:
             fullcmd = self.macro_format + " " + " ".join([str(a) for a in args])
         except Exception:
-            import traceback
-
-            logging.getLogger("HWR").info(traceback.format_exc())
             logging.getLogger("HWR").info(
                 "  - Wrong format for macro arguments. Macro is %s / args are (%s)"
                 % (self.macro_format, str(args))
@@ -294,12 +291,7 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
             logging.getLogger("HWR").debug("Cannot connect to door %s" % self.doorname)
             self.emit("commandFailed", (-1, str(self.name())))
         except Exception:
-            import traceback
-
-            logging.getLogger("HWR").debug(
-                "SardanaMacro / event handling problem. Uggh. %s"
-                % traceback.format_exc()
-            )
+            logging.getLogger("HWR").exception("SardanaMacro / event handling problem.")
             self.emit("commandFailed", (-1, str(self.name())))
 
     def abort(self):
@@ -421,10 +413,8 @@ class SardanaChannel(ChannelObject, SardanaObject):
                     self.info.maxval = maxval.magnitude
 
         except Exception:
-            import traceback
-
             logging.getLogger("HWR").info("info initialized. Cannot get limits")
-            logging.getLogger("HWR").info("%s" % traceback.format_exc())
+            logging.getLogger("HWR").exception("")
 
         # prepare polling
         # if the polling value is a number set it as the taurus polling period
@@ -454,9 +444,7 @@ class SardanaChannel(ChannelObject, SardanaObject):
             self.info.minval = limits[0].magnitude
             self.info.maxval = limits[1].magnitude
         except Exception:
-            import traceback
-
-            logging.getLogger("HWR").info("%s" % traceback.format_exc())
+            logging.getLogger("HWR").exception("")
         return self.info
 
     def update(self, event):

mxcubecore/HardwareObjects/ALBA/ALBADataAnalysis.py

@@ -122,10 +122,8 @@ class ALBADataAnalysis(EDNACharacterisation):
             state = self.job.state
             self.log.debug("Job / is %s" % str(state))
         except Exception:
-            import traceback
-
             self.log.debug("Polling for Job state 3. exception happened")
-            self.log.debug("  %s " % traceback.format_exc())
+            self.log.exception("")
 
         while state in ["RUNNING", "PENDING"]:
             self.log.debug("Job / is %s" % state)

mxcubecore/HardwareObjects/ALBA/ALBAEpsActuator.py

@@ -88,9 +88,7 @@ class ALBAEpsActuator(BaseHardwareObjects.HardwareObject):
                 states = state_string.split(",")
                 self.state_strings = states[1].strip(), states[0].strip()
         except Exception:
-            import traceback
-
-            self.log.warning(traceback.format_exc())
+            self.log.exception()
             self.state_strings = self.default_state_strings
 
     def get_state(self):

mxcubecore/HardwareObjects/ALBA/ALBAFastShutter.py

@@ -99,9 +99,7 @@ class ALBAFastShutter(BaseHardwareObjects.HardwareObject):
                 states = state_string.split(",")
                 self.state_strings = states[1].strip(), states[0].strip()
         except Exception:
-            import traceback
-
-            self.log.warning(traceback.format_exc())
+            self.log.exception("")
             self.state_strings = self.default_state_strings
 
     def get_state(self):

mxcubecore/HardwareObjects/Cats90.py

@@ -1084,10 +1084,8 @@ class Cats90(SampleChanger):
         try:
             task_id = method(*args)
         except Exception:
-            import traceback
-
             self.log.debug("Cats90. exception while executing server task")
-            self.log.debug(traceback.format_exc())
+            self.log.exception("")
             task_id = None
 
         waitsafe = kwargs.get("waitsafe", False)

mxcubecore/HardwareObjects/CatsMaint.py

@@ -824,11 +824,8 @@ class CatsMaint(HardwareObject):
                 ret = cmd()
             return ret
         except Exception as exc:
-            import traceback
-
-            traceback.print_exc()
-            msg = exc[0].desc
-            raise Exception(msg)
+            self.log.exception("")
+            raise
 
 
 def test_hwo(hwo):

mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py

@@ -25,7 +25,6 @@ __email__ = "jan.meyer@desy.de"
 
 
 import json
-import traceback
 
 import gevent
 
@@ -39,7 +38,6 @@ try:
 
     redis_flag = True
 except ImportError:
-    traceback.print_exc()
     redis_flag = False
 
 from mxcubecore.HardwareObjects.abstract.AbstractVideoDevice import AbstractVideoDevice

mxcubecore/HardwareObjects/DESY/P11Collect.py

@@ -29,7 +29,6 @@ import socket
 import subprocess
 import sys
 import time
-import traceback
 
 import gevent
 import h5py
@@ -329,7 +328,7 @@ class P11Collect(AbstractCollect):
                 )
 
         except RuntimeError:
-            self.log.error(traceback.format_exc())
+            self.log.exception("")
         finally:
             self.acquisition_cleanup()
 
@@ -783,7 +782,7 @@ class P11Collect(AbstractCollect):
             HWR.beamline.diffractometer.stop_motion()
 
         except RuntimeError:
-            self.log.error(traceback.format_exc())
+            self.log.exception("")
 
     def get_or_create_group(self, parent_group, group_name):
         """Gets or creates a group within a parent group.

mxcubecore/HardwareObjects/DESY/P11EDNACharacterisation.py

@@ -244,10 +244,8 @@ class P11EDNACharacterisation(EDNACharacterisation):
             transmission = HWR.beamline.transmission.get_value()
             beam.setTransmission(XSDataDouble(transmission))
         except AttributeError:
-            import traceback
-
             self.log.debug("EDNACharacterisation. transmission not saved ")
-            self.log.debug(traceback.format_exc())
+            self.log.exception("")
 
         try:
             wavelength = HWR.beamline.energy.get_wavelength()

mxcubecore/HardwareObjects/EDNACharacterisation.py

@@ -140,10 +140,7 @@ class EDNACharacterisation(AbstractCharacterisation):
             transmission = HWR.beamline.transmission.get_value()
             beam.setTransmission(XSDataDouble(transmission))
         except AttributeError:
-            import traceback
-
-            self.log.debug("EDNACharacterisation. transmission not saved ")
-            self.log.debug(traceback.format_exc())
+            self.log.exception("EDNACharacterisation. transmission not saved ")
 
         try:
             wavelength = HWR.beamline.energy.get_wavelength()

mxcubecore/HardwareObjects/QueueManager.py

@@ -9,7 +9,6 @@ documentation for the queue_entry module for more information.
 """
 
 import logging
-import traceback
 
 import gevent
 
@@ -250,7 +249,7 @@ class QueueManager(HardwareObject, QueueEntryContainer):
             self.emit("queue_entry_execute_finished", (entry, "Failed"))
             self.emit("statusMessage", ("status", "Queue execution failed", "error"))
         except:
-            self.log.warning("encountered Exception:\n%s" % traceback.format_exc())
+            self.log.exception("")
             raise
         else:
             entry.post_execute()

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Collect.py

@@ -450,10 +450,8 @@ class PX1Collect(AbstractCollect, HardwareObject):
                 )
                 return False
         except Exception:
-            import traceback
-
             logging.error("PX1Collect: Cannot generate thumbnails for %s" % filename)
-            logging.error(traceback.format_exc())
+            logging.exception("")
             return False
 
     ## generate snapshots and data thumbnails (END) ##
@@ -487,12 +485,10 @@ class PX1Collect(AbstractCollect, HardwareObject):
         try:
             os.chmod(process_dir, 0o777)
         except Exception:
-            import traceback
-
             self.log.error(
                 "PX1Collect: Error changing permissions for PROCESS directory"
             )
-            self.log.error(traceback.format_exc())
+            self.log.exception()
 
         self.create_goimg_file(process_dir)
 

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1EnergyScan.py

@@ -313,11 +313,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
 
             self.scanCommandFinished()
         except Exception:
-            import traceback
-
-            self.log.error(
-                "EnergyScan: problem starting energy scan. %s" % traceback.format_exc()
-            )
+            self.log.exception("EnergyScan: problem starting energy scan.")
             self.scanCommandFailed()
             self.scanStatusChanged("error starting energy scan")
             return False
@@ -497,9 +493,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
             # pk, fppPeak, fpPeak, ip, fppInfl, fpInfl, chooch_graph_data = \
             #       result
         except Exception:
-            import traceback
-
-            self.log.debug(traceback.format_exc())
+            self.log.exception("")
             self.store_energy_scan()
             self.log.error("Energy scan: Chooch failed")
             return

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1MiniDiff.py

@@ -226,12 +226,10 @@ class PX1MiniDiff(GenericDiffractometer):
             try:
                 motor.set_value(position, timeout=None)
             except Exception:
-                import traceback
-
                 self.log.debug(
                     "  / error moving motor on diffractometer. state is %s"
                     % (self.smargon_state)
                 )
-                self.log.debug("     / %s " % traceback.format_exc())
+                self.log.exception("")
 
         self.wait_device_ready(timeout)

mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Diffractometer.py

@@ -23,7 +23,6 @@ import logging
 import os
 import pickle
 import time
-import traceback
 from math import sqrt
 
 import beam_align
@@ -812,7 +811,6 @@ class PX2Diffractometer(GenericDiffractometer):
         # motors[motor_role] = motor_pos[motor_obj]
         # except KeyError:
 
-        # self.log.exception('convert_from_obj_to_name %s' % traceback.format_exc())
         # if motor_obj:
         # motors[motor_role] = motor_obj.get_value()
 
@@ -912,7 +910,7 @@ class PX2Diffractometer(GenericDiffractometer):
                         c[key] = self.motor_hwobj_dict[key].get_value()
                     except Exception:
                         # self.log.info('motor_positions_to_screen exception key %s' % key)
-                        self.log.info(traceback.format_exc())
+                        self.log.exception("")
 
             if "kappa" in c and c["kappa"] is None:
                 kappa = self.motor_hwobj_dict["kappa"].get_value()
@@ -1402,14 +1400,14 @@ class PX2Diffractometer(GenericDiffractometer):
         try:
             self.nclicks = int(nclicks)
         except Exception:
-            self.log.exception(traceback.format_exc())
+            self.log.exception("")
 
     def set_step(self, step):
         self.log.info("PX2Diffractometer: centring step changed: %s" % step)
         try:
             self.step = float(step)
         except Exception:
-            self.log.exception(traceback.format_exc())
+            self.log.exception("")
 
     def set_centring_method(self, centring_method):
         self.log.info(
@@ -1418,7 +1416,7 @@ class PX2Diffractometer(GenericDiffractometer):
         try:
             self.centring_method = centring_method
         except Exception:
-            self.log.exception(traceback.format_exc())
+            self.log.exception("")
 
     def is_ready(self):
         """

mxcubecore/HardwareObjects/SOLEIL/SOLEILEnergyScan.py

@@ -285,11 +285,7 @@ class SOLEILEnergyScan(HardwareObject):
             self.xanes.scan()  # start() #scan()
             self.scanCommandFinished("success")
         except Exception:
-            import traceback
-
-            self.log.error(
-                "EnergyScan: problem calling sequence %s" % traceback.format_exc()
-            )
+            self.log.exception("EnergyScan: problem calling sequence")
             self.emit("scanStatusChanged", ("Error problem spec macro",))
             return False
         return True
@@ -509,12 +505,9 @@ class SOLEILEnergyScan(HardwareObject):
                 )
                 return None
             except Exception:
-                import traceback
+                self.user_log.error("Error creating archive path")
+                self.log.exception("Error creating archive path")
 
-                logging.getLogger("user_level_log").error(
-                    "Error creating archive path (%s) \n   %s"
-                    % (dirname, traceback.format_exc())
-                )
                 return None
         else:
             if not os.path.isdir(dirname):
@@ -528,9 +521,7 @@ class SOLEILEnergyScan(HardwareObject):
             fi = open(scanFile)
             fo = open(archiveEfsFile, "w")
         except Exception:
-            import traceback
-
-            logging.getLogger("user_level_log").error(traceback.format_exc())
+            self.user_log.exception("")
             self.storeEnergyScan()
             self.emit("energyScanFailed", ())
             return None

mxcubecore/HardwareObjects/SOLEIL/SOLEILISPyBClient.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import traceback
 from collections import namedtuple
 
 import urllib2
@@ -95,11 +94,9 @@ class SOLEILISPyBClient(ISPyBClient):
                         "SOLEILISPyBClient: extracted from ISPyB values for shipping, collection and tools"
                     )
                 except Exception:
-                    print(traceback.print_exc())
-                    logging.exception("SOLEILISPyBClient: %s" % _CONNECTION_ERROR_MSG)
+                    self.log.exception("SOLEILISPyBClient: %s" % _CONNECTION_ERROR_MSG)
                     return
         except Exception:
-            print(traceback.print_exc())
             self.log.exception(_CONNECTION_ERROR_MSG)
             return
         try:

mxcubecore/HardwareObjects/SOLEIL/SOLEILSafetyShutter.py

@@ -19,10 +19,7 @@ class SOLEILSafetyShutter(HardwareObject):
             self.connect(self.shutter, "shutterStateChanged", self.shutterStateChanged)
             self.connect(self.pss, "wagoStateChanged", self.shutterStateChanged)
         except Exception:
-            import traceback
-
-            print(traceback.print_exc())
-            logging.debug(traceback.format_exc())
+            logging.exception("")
             logging.getLogger().warning("pss device not configured")
 
     def getShutterState(self):

mxcubecore/HardwareObjects/SOLEIL/SOLEILqueue_entry.py

@@ -92,7 +92,7 @@ class PX2DataCollectionQueueEntry(DataCollectionQueueEntry):
                 list_item.setText(1, "Stopped")
                 raise QueueAbortedException("queue stopped by user", self)
             except Exception as ex:
-                print(traceback.print_exc())
+                self.log.exception("")
                 raise QueueExecutionException(ex.message, self)
         else:
             log.error(

mxcubecore/HardwareObjects/SOLEIL/TangoDCMotor.py

@@ -128,8 +128,6 @@ class TangoDCMotor(HardwareObject):
             if numpy.inf in limits:
                 limits = numpy.array([-10000, 10000])
         except Exception:
-            # import traceback
-            # self.log.info("TangoDCMotor.get_limits: Cannot get limits for %s.\nException %s " % (self.motor_name, traceback.print_exc()))
             if self.motor_name in [
                 "detector_distance",
                 "detector_horizontal",

mxcubecore/HardwareObjects/SecureXMLRpcRequestHandler.py

@@ -83,17 +83,10 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCRequestHandler):
                 response = self.server._marshaled_dispatch(
                     data, getattr(self, "_dispatch", None)
                 )
-            except Exception as e:  # This should only happen if the module is buggy
+            except Exception:  # This should only happen if the module is buggy
                 # internal error, report as HTTP server error
                 self.send_response(500)
-
-                # Send information about the exception if requested
-                if (
-                    hasattr(self.server, "_send_traceback_header")
-                    and self.server._send_traceback_header
-                ):
-                    self.send_header("X-exception", str(e))
-                    self.send_header("X-traceback", traceback.format_exc())
+                logging.getLogger("HWR").exception("Exception during request.")
 
                 self.end_headers()
             else:

mxcubecore/HardwareObjects/XMLRPCServer.py

@@ -689,7 +689,7 @@ class XMLRPCServer(HardwareObject):
                         module_name + "." + sub_module[1], recurse=False, prefix=prefix
                     )
                 except StopIteration:
-                    logging.getLogger("HWR").exception("")
+                    pass
 
     def set_token(self, token):
         SecureXMLRpcRequestHandler.setReferenceToken(token)

mxcubecore/saferef.py

@@ -2,7 +2,6 @@
 
 import collections
 import logging
-import traceback
 import weakref
 
 
@@ -122,15 +121,9 @@ class BoundMethodWeakref(object):
                     if isinstance(function, collections.abc.Callable):
                         function(self)
                 except Exception:
-                    try:
-                        traceback.print_exc()
-                    except AttributeError as e:
-                        print(
-                            (
-                                "Exception during saferef %s "
-                                "cleanup function %s: %s" % (self, function, e)
-                            )
-                        )
+                    logging.getLogger("HWR").exception(
+                        f"Exception during `saferef` {self} cleanup function {function}"
+                    )
 
         self.deletion_methods = [on_delete]
         self.key = self.calculate_key(target)

{mxcubecore-1.394.0.dist-info → mxcubecore-1.396.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.394.0
+Version: 1.396.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.394.0.dist-info → mxcubecore-1.396.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ mxcubecore/Command/Epics.py,sha256=osz7DBv_R21gcxQiXfQKPm-zNfZOQEx_wrfXAJyOuDs,7
 mxcubecore/Command/Exporter.py,sha256=HL6hncI_EUjjVX7frOsmxGa2Gyc-3PwUPXLUBJk4B20,8076
 mxcubecore/Command/Mockup.py,sha256=OrGAJC0JjTTjGSMZl7NiWJmVUQeEThMYdSQzuBD-bEc,1949
 mxcubecore/Command/Pool.py,sha256=ZS8sRafNSAo2Da_F-m-NOpJ1kmHi_l2SidZsdCxa7fY,9274
-mxcubecore/Command/Sardana.py,sha256=xoizMk0uiyPbB4JVV2ZWtAgBnOqQUaOK1YhUB71MPY0,15884
+mxcubecore/Command/Sardana.py,sha256=6iKxdG4rwyDzvjxSmK1mnkUIZQNNrEgXMYVyJHromvk,15578
 mxcubecore/Command/Spec.py,sha256=a3dqqXhwq1FNOo5zD9DSnVv5FgCU3jyW-lJ_QT8SNlo,3636
 mxcubecore/Command/Taco.py,sha256=3MULNnns4fGvpunBvTvKCTK_4bmK3bJb1qXglwgBfYE,5556
 mxcubecore/Command/Tango.py,sha256=S0M3wBVDoEf3HmUONOPVCC2fs30s9GYu5T4_Tr5zaEo,10494
@@ -24,10 +24,10 @@ mxcubecore/HardwareObjects/ALBA/ALBACats.py,sha256=IIv4raiq-rnoTFBK3z5bRA4z5hXw0
 mxcubecore/HardwareObjects/ALBA/ALBACatsMaint.py,sha256=Tay4jYWkyAND7bzhK6sKXJWR1E4OfiV9Ix1Gd2m5pjI,1606
 mxcubecore/HardwareObjects/ALBA/ALBAClusterJob.py,sha256=Cr94Uu0gjuHkg0Ya_ulSBCr5-fbH27eWqnTQkyF25W0,3220
 mxcubecore/HardwareObjects/ALBA/ALBACollect.py,sha256=hmCDOn5C8o_PyrmV3ZtbXdkJ2_7n7Y76DsJFlIwD2ng,29755
-mxcubecore/HardwareObjects/ALBA/ALBADataAnalysis.py,sha256=NdlC7h_J6GhkRvpSy6gah36t-wMKr8nd95IO_tgunZA,5969
+mxcubecore/HardwareObjects/ALBA/ALBADataAnalysis.py,sha256=P8wt9cqwphyx9jGK9hqOfkInKjrn0oONWr9gzCeZyt0,5913
 mxcubecore/HardwareObjects/ALBA/ALBAEnergy.py,sha256=OJ2gyDyYQjxk7r6jAixyXh-j8qKl12dnkBqx63rMNNQ,2280
-mxcubecore/HardwareObjects/ALBA/ALBAEpsActuator.py,sha256=InRsz9gnLjJUSMhTDcmtegTbHy8M8MLoWTP72RSHp28,3911
-mxcubecore/HardwareObjects/ALBA/ALBAFastShutter.py,sha256=igM-Imb4RIwJxJRtm_PqD4puwIWa0GqMf6FxZTo0_t0,6301
+mxcubecore/HardwareObjects/ALBA/ALBAEpsActuator.py,sha256=J1Z6qSmTG3gfyZN7ots5U2AqhSZO917ZDlY2Yx4mH8o,3861
+mxcubecore/HardwareObjects/ALBA/ALBAFastShutter.py,sha256=tQK7WR67yEh2RFRzXNeH-csRgJM46A2vl9BB2doyfuc,6253
 mxcubecore/HardwareObjects/ALBA/ALBAFlux.py,sha256=FK-d8MAYvQ3yzEPOX535Bib3ls88R6YCRQaYfyOs1dw,1185
 mxcubecore/HardwareObjects/ALBA/ALBAFrontEnd.py,sha256=qBq0-gaZEKTZepDGLeP7_OfsJUZeHvKS5aFPQ0InSsQ,1404
 mxcubecore/HardwareObjects/ALBA/ALBAFrontLight.py,sha256=6sCAz0p69CDofgnnM75WU2PmLvIroaY89bEd_UPU9Bc,3925
@@ -59,23 +59,23 @@ mxcubecore/HardwareObjects/BlissMotorWPositions.py,sha256=jB3j6ScQJt4IGyBjUT_IOq
 mxcubecore/HardwareObjects/BlissNState.py,sha256=F_0lZjhlw2viAqqf2bl18Z2rv9nn2IyBsB2ZScNhKNs,6280
 mxcubecore/HardwareObjects/BlissRontecMCA.py,sha256=NcRgBR4HY7r7TBC33qwZ_1g0_c0N4Xwnj8f0EmNVHS0,2027
 mxcubecore/HardwareObjects/BlissShutter.py,sha256=2bdRZvWDCnajHcTLUAYFgS_HUqDA7fBqp7D1wadTB0w,4536
-mxcubecore/HardwareObjects/Cats90.py,sha256=dKg-lXP0E-wVanSIswgF9Z2k8gIxeVOpAOeX3WriANU,52789
+mxcubecore/HardwareObjects/Cats90.py,sha256=LrR-cBW9Lir7y2fmUrF4AGWB2CUZ8LZe_3UoFtgUAYQ,52743
 mxcubecore/HardwareObjects/CatsBessy.py,sha256=KUsdEzENWg8SoWHy-qAkfayKdUQnEaxCpA2Jhfl7Cyc,18413
-mxcubecore/HardwareObjects/CatsMaint.py,sha256=BQQFS-fgKe-a8n0GqN7krDZrs8wWgceCqDsLCEqRUUw,25430
+mxcubecore/HardwareObjects/CatsMaint.py,sha256=xgSDKUVS-EZHL-7ZW4yt0lopCDIqhIdPgkt3pRzCi74,25356
 mxcubecore/HardwareObjects/CentringMath.py,sha256=RLuoZgpFBM041FcgmHQHEx6waes8Tjl8HACSoDcoOkY,10149
 mxcubecore/HardwareObjects/DESY/Centring.py,sha256=IPTixihuc5d4XoI9AEgk22sVfTQoMJOILpsKUKXaQ4E,5855
 mxcubecore/HardwareObjects/DESY/DigitalZoomMotor.py,sha256=MM5Re8oEGH8yBd2RX2X1VNn4Fb5_Lr9BFTu3fBxEIUg,4611
-mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py,sha256=ckfIX16VFgQL-aciZOIMEsTftAK6U5MpCs8520wIq_U,35631
+mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py,sha256=P4AuwpbD3mHNSA18xUoZW4XjJrGf2fUntv6hAvRqA_A,35588
 mxcubecore/HardwareObjects/DESY/P11AlbulaView.py,sha256=7IIj3F690Si1UHAJUEcLUCmI8B99pGUTRiQH05BkCsA,7159
 mxcubecore/HardwareObjects/DESY/P11BackLight.py,sha256=YR2hFpWlKq5eWeuyWioFnBeSvEtSX9eUJk2omzX8KrI,3619
 mxcubecore/HardwareObjects/DESY/P11Beam.py,sha256=XoJxS2GF0jEfiH1rjO-93JEerGzTW5VKLa4h7LyqkTs,5176
 mxcubecore/HardwareObjects/DESY/P11BeamStop.py,sha256=M3kcbOecXdnnVgmbVnC_7GFXm8mKGGC7BI7fXV6TKX8,4652
-mxcubecore/HardwareObjects/DESY/P11Collect.py,sha256=Y91_eaG6wAzMBy2ZI54uvPhJfuj5NnkN3P5DO_p2ZV4,51044
+mxcubecore/HardwareObjects/DESY/P11Collect.py,sha256=HNxzcEA8FnP9YsFg4EOTQKzQapwU9bQs5e1S13M3mfE,50995
 mxcubecore/HardwareObjects/DESY/P11Collimator.py,sha256=tMhl9bdroZGynku6mbF2swOAeIiGANvgcipBdvcneJ4,5400
 mxcubecore/HardwareObjects/DESY/P11DetectorCover.py,sha256=doujc008LIgsm_CKUuFuMw5wlTm_UfRRvivCqwwx5w4,6129
 mxcubecore/HardwareObjects/DESY/P11DetectorDistance.py,sha256=T_16zuOV6OTUCF2VN5p-xvJ2GK2M3ERiq3B_Nny0c9o,5927
 mxcubecore/HardwareObjects/DESY/P11DoorInterlock.py,sha256=pYO9LWEqcuga1MNLzVFTNqgxPnjjB076oUBLZQ7gTEk,3145
-mxcubecore/HardwareObjects/DESY/P11EDNACharacterisation.py,sha256=DV-UTysuhMBJgQuRoG_HeXfOgvujoVJe6MJWfOpyQA0,25490
+mxcubecore/HardwareObjects/DESY/P11EDNACharacterisation.py,sha256=C7AMVBtGW570UHsGoI-5SuUykLNTB7I2w0PCKN7NV6I,25444
 mxcubecore/HardwareObjects/DESY/P11EigerDetector.py,sha256=8JvH79IvHnkMH9QpqeBfvbs7EJuIq3A8i6Z2Y91MlD4,10487
 mxcubecore/HardwareObjects/DESY/P11Energy.py,sha256=jUCsm8c5FPcBRB5K4M8Olkf_Hn-A3diR-4VYugnqYzo,4842
 mxcubecore/HardwareObjects/DESY/P11FastShutter.py,sha256=IlXDUWWe2d24-vO__8gEUO7THMLsgOnr7lW-jPVK9Pg,3063
@@ -94,7 +94,7 @@ mxcubecore/HardwareObjects/DESY/ValueStateChannel.py,sha256=zWFcd3KtM-qSrtmp5NW_
 mxcubecore/HardwareObjects/DESY/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/HardwareObjects/DataPublisher.py,sha256=eknx7rddeZVXFmAHzcNC3qzvaEbBnp9tAjwNuIwsVkQ,10934
 mxcubecore/HardwareObjects/DozorOnlineProcessing.py,sha256=ofas-B18kDXNR9Yuedt2UJxi76UPpC-2BwNN3E0mUNc,3244
-mxcubecore/HardwareObjects/EDNACharacterisation.py,sha256=0piAzpQCOSdl-prOm49hXek-53HSCBgIeDB-sUrupQo,18970
+mxcubecore/HardwareObjects/EDNACharacterisation.py,sha256=vDXCkCqcgu1J9078caiK47ozKYRdHseGQdSZTOVMis4,18893
 mxcubecore/HardwareObjects/EMBL/EMBLAperture.py,sha256=iGsWF7LS-D8Wir_o1IazVESlz6R1Y_-egy_YuU35Uak,5217
 mxcubecore/HardwareObjects/EMBL/EMBLBSD.py,sha256=iRkneY9eer-RnqWKNsyy4rT4H8mgQ9A22k_2haZtv9c,9685
 mxcubecore/HardwareObjects/EMBL/EMBLBeam.py,sha256=jC_XBWCoh8i40WNIr89H_679hqYgpTOpgguNjDua51k,12616
@@ -264,7 +264,7 @@ mxcubecore/HardwareObjects/QtGraphicsManager.py,sha256=b1ZvROpez3Ypv0rtQOcvRMnAG
 mxcubecore/HardwareObjects/QtInstanceServer.py,sha256=CJabKEFGaY9XuEu4_bL1Eauv4mIaGivNqnw2Cx8Zewg,44732
 mxcubecore/HardwareObjects/QtLimaVideo.py,sha256=RxBCXpBg-asNaEUrsFYDAU5QEUJyvH2uFNhMXOD4rjo,4512
 mxcubecore/HardwareObjects/QtTangoLimaVideo.py,sha256=I0lM08hUAjbU_ZElnF6uIx1hLMw7IWiqukzQt4umYg8,4489
-mxcubecore/HardwareObjects/QueueManager.py,sha256=OsHSQErg32tvPf3SjPubzUXp8tmo7Qdw80vkkQoeekQ,15017
+mxcubecore/HardwareObjects/QueueManager.py,sha256=kwSWpJMD5lQ31iwFPIWbZr1bQdSh-6uQb-jJo5M-Bdw,14951
 mxcubecore/HardwareObjects/QueueModel.py,sha256=wS247qcYIvqdvMKCiqxjg9a0P6dxTIjzS5uJVj0NIZI,18728
 mxcubecore/HardwareObjects/RedisClient.py,sha256=b2X3gGYxdTgx-dfFuraoY_tyC_Lv86H7OMalUGPhbYE,7310
 mxcubecore/HardwareObjects/Resolution.py,sha256=5-wAnHOp4geFCdEYmal8H8lc1js20mOTlJSnUp6zjq0,1914
@@ -272,14 +272,14 @@ mxcubecore/HardwareObjects/SC3.py,sha256=Z_YmzmlECmIEt9WlBDCYkze6UALk0YANfDfXuBe
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Attenuator.py,sha256=uCf3QaO4mkrLcrgT6Atuj0V9ojK4DUY7KVdk0EtH8TQ,1987
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1BeamInfo.py,sha256=Gn9XqVufwInI3uiCdJcqPAVAOIEFH9xq7dTT07NhWoQ,4419
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1CatsMaint.py,sha256=nhTig6lKb0ZUR_eLX3VEiAOqc1sVXp4Wx_RcX5SeF-o,1909
-mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Collect.py,sha256=f17TJJWcxyauOcIwPMLKZHS-kMCQNGowFrVHxy9emgU,31373
+mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Collect.py,sha256=PnglNIxy4PL8OcmoW4NK-ie0hM4PsTryzR0Xpo9PKcI,31279
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Configuration.py,sha256=QWHiuy5nfqxIQQGcxufTgpplsftCl4-BS9Tm0YUbWd4,2530
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Cryotong.py,sha256=IHSlMIHNM9BFRKrLltU9fip01cYl2SXb-uXXUwyYgHU,10838
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1DetectorDistance.py,sha256=gD2W2aTn89w9pk0eyVTv9N3kEwYNTfpV3NRB32rZbHE,4953
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Energy.py,sha256=K2LLXLdPOtYBWJuf0Hv6ALbRgxvkHYjdTD9Fj32BrqQ,8211
-mxcubecore/HardwareObjects/SOLEIL/PX1/PX1EnergyScan.py,sha256=Sp8ebei3MquMczzy2zttPnUcbTzNmhEaUG8FBxysuUc,24468
+mxcubecore/HardwareObjects/SOLEIL/PX1/PX1EnergyScan.py,sha256=TGejmuRF_ThfI-zHWEuH-lKl-ddbEzyK4rw_26FaorA,24338
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Environment.py,sha256=opDKuK3Cd-zg6GxUrweCk6RDtt9cd1aN2i4W_qmObrw,10329
-mxcubecore/HardwareObjects/SOLEIL/PX1/PX1MiniDiff.py,sha256=UBNS_y0GmxgsooGk8b_tdFL5rCYCBWgqWLhMf4O2ZJM,8567
+mxcubecore/HardwareObjects/SOLEIL/PX1/PX1MiniDiff.py,sha256=DIt9hkz_GgMMcch0Utog3YnEww4qtS0-f56qmPqbcVE,8502
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Pilatus.py,sha256=tZqA_zGneTEE-7_IahVOjLPLEyMDgsK-iXoUvQ9lD0M,8762
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Pss.py,sha256=2MkKL5XhmteS8KzJ9KwOKLbwBIZIFdLwFGqXXMEx8bs,800
 mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Resolution.py,sha256=YxFEM4j58XjmhOnxOc-LAWkHFVb4dTOD-_KWM9JTIus,5187
@@ -288,7 +288,7 @@ mxcubecore/HardwareObjects/SOLEIL/PX1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Attenuator.py,sha256=OaIGz5hddVlng7bFofjDQ9GFvkJVlcd5NeS9hIhCyIM,8008
 mxcubecore/HardwareObjects/SOLEIL/PX2/PX2BeamInfo.py,sha256=J0ydfc1KGt5no-in1b8_e39zldQ6FmpV6Ong5zfPVOE,6151
 mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Collect.py,sha256=7oRpin0WCTycCWw5NI5nnSmE79q1KohIiy1inL-l8j4,14131
-mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Diffractometer.py,sha256=sOmPZhBHBNAwCSU5DmCfURjvE61d9DNdYGMVktJipSo,50675
+mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Diffractometer.py,sha256=TYpLFJJByGSQtdQyH4tu3rM2dfADoqJfNhObZZ4zb9M,50498
 mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Energy.py,sha256=VgpFsmS__YjCv9AwOLhjhe6Co5OYgHLiqc5Naw2B_FI,4120
 mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Guillotine.py,sha256=b1f1wxfcL4ANGDbRnFausX7aadAWXom9Oy1IxV1oGz8,8074
 mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Qt4_LimaVideo.py,sha256=KZY3YJZCG8a6Z7Pgzyz8ju7rZV2bzoaFdqyDFXZyXao,3579
@@ -296,22 +296,22 @@ mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Resolution.py,sha256=unwwW083X7HDRMBsRE
 mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Video.py,sha256=_LOdRi_heDQbYIzzy7TDPWmxu_IP9KXMqkZU5wbH1Eg,3561
 mxcubecore/HardwareObjects/SOLEIL/PX2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/HardwareObjects/SOLEIL/SOLEILCatsMaint.py,sha256=DAcSv5IZIYI-l9xH4xgshepQOOpxM22owG90PCF5mwE,15145
-mxcubecore/HardwareObjects/SOLEIL/SOLEILEnergyScan.py,sha256=K3xjZb14Aqln-MJtp3QnZA1Q99L1LWlrJ2mpW-rHDvU,31221
+mxcubecore/HardwareObjects/SOLEIL/SOLEILEnergyScan.py,sha256=UJwkKp01jEaoqrmtIaInaCFO3Fdc3UM2tubkMf-pgdw,30973
 mxcubecore/HardwareObjects/SOLEIL/SOLEILFlux.py,sha256=P_Qh2UlyqaBUaE4CBLEWPU76LU5ktAwDmIW6hQPuR0g,647
 mxcubecore/HardwareObjects/SOLEIL/SOLEILGuillotine.py,sha256=JARz7fJ2x_5uEzdmuEh5tjrSYwPep43MRbYgx78rGU0,8220
-mxcubecore/HardwareObjects/SOLEIL/SOLEILISPyBClient.py,sha256=R0GD2uNGUklPyLQ92HS-hxusfvtVWjTrtH55cQNJtxU,8261
+mxcubecore/HardwareObjects/SOLEIL/SOLEILISPyBClient.py,sha256=AYBcz8xCbfT_sE_8sAgJpE5vBmJIvUVmqVTeU8mJysQ,8155
 mxcubecore/HardwareObjects/SOLEIL/SOLEILMachineInfo.py,sha256=vF5mrBFJE4TZcrbOqHKfmo-nARw2x3xJpOtR3zvntpY,16696
 mxcubecore/HardwareObjects/SOLEIL/SOLEILPss.py,sha256=CzpKmaN57n8hrNUrJ1vvdcRtU-n2P94GAeHuI_tS_fc,1551
 mxcubecore/HardwareObjects/SOLEIL/SOLEILRuche.py,sha256=WfhySX6qfEFyOmOwUzHg8uUNlurMaJml0nLMEp-D_CQ,2194
-mxcubecore/HardwareObjects/SOLEIL/SOLEILSafetyShutter.py,sha256=OuFagYFB0MX9HHbKUYM-3uafBYvJhs8XyU-yoUxU9c8,2045
+mxcubecore/HardwareObjects/SOLEIL/SOLEILSafetyShutter.py,sha256=_nyRGjsYF0b5sve46lqIoQ9DkUcT2o_ZhglbDAcUwi4,1958
 mxcubecore/HardwareObjects/SOLEIL/SOLEILSession.py,sha256=4gGLhHR_5sWAh-LsrdCC5MIiNJkQZjzk7C8IeIzg9lw,5270
-mxcubecore/HardwareObjects/SOLEIL/SOLEILqueue_entry.py,sha256=U0V-WDwQ01lDMSTa-xU57wt7i2EdWm5Nz1FcTk-7djY,7176
-mxcubecore/HardwareObjects/SOLEIL/TangoDCMotor.py,sha256=xT1qwuzsnWR9jtS5o63AqSVJupxn6aqzQqdT_-aBqMg,8622
+mxcubecore/HardwareObjects/SOLEIL/SOLEILqueue_entry.py,sha256=3IONTd5RMA66pKroWysXm3YLEevkOuxPczNFps6drOo,7170
+mxcubecore/HardwareObjects/SOLEIL/TangoDCMotor.py,sha256=I0dbN64gxtxX5lEBummNotQNadnF5GuZ8kwRxrDZI-4,8451
 mxcubecore/HardwareObjects/SOLEIL/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/HardwareObjects/SampleStage.py,sha256=GykGZfus7B_0qeHvMT7pU0MZ8CBjVaAir0JiF_v39YM,641
 mxcubecore/HardwareObjects/SampleView.py,sha256=zTgn15AXgzKw0RtxQCl-sLqwqTWyJGgPsiJ8FPQfJZY,19418
 mxcubecore/HardwareObjects/SardanaMotor.py,sha256=3KLkvnFPg_kGkmyglpJ3A63CxDmwYnPW6dRuYqOVnvo,7391
-mxcubecore/HardwareObjects/SecureXMLRpcRequestHandler.py,sha256=cpcSYcKU25_mBENUJ1oFBual9NRdg0VPnBhbTdYghGY,4215
+mxcubecore/HardwareObjects/SecureXMLRpcRequestHandler.py,sha256=Y_OarAExH6eg-Pc8NMCEkZeL7m3sKjA3o12nfb2sKQ0,3919
 mxcubecore/HardwareObjects/Session.py,sha256=FcWZI3HmEPZ0C1y4NMtjEw513ZGlrMovPuuuw73xhmU,13095
 mxcubecore/HardwareObjects/SimpleHTML.py,sha256=OOGN4ljwn2QtM9ZESDUHSTYvj7xsOOlMyrYs6p2XVDU,9175
 mxcubecore/HardwareObjects/SpecMotor.py,sha256=J-92iDpbUK7Odm1ZBMF3ywUtCR3q-9_-s8AfyWkJ-us,2134
@@ -331,7 +331,7 @@ mxcubecore/HardwareObjects/Transmission.py,sha256=XWG4mkSj8wGXYSfRg0ExH49_GhtPUI
 mxcubecore/HardwareObjects/UnitTest.py,sha256=TuhMcLiQ97v7Vyl0PyDxlDZaLVuhi-nvn9IMQHdhO74,3362
 mxcubecore/HardwareObjects/UserTypeISPyBLims.py,sha256=T6dBxmPpl9midpKCQymmt7qf-89g2j9eKp6ueGfA3AI,10954
 mxcubecore/HardwareObjects/VimbaVideo.py,sha256=Ll_8NwRm4kHWxg44AN5JjAyrYMDzU6AaPAR-7g2v8W4,3158
-mxcubecore/HardwareObjects/XMLRPCServer.py,sha256=Xe2HNhfbv3dNTGoxNz3oy5W1N1f1uxb7MUsQoiDT4sI,25621
+mxcubecore/HardwareObjects/XMLRPCServer.py,sha256=L7HRVFIYOIKtDLWner_YylPc0dORWz8WWvKiyqkYsGE,25587
 mxcubecore/HardwareObjects/XRFSpectrum.py,sha256=6-EF30kvymaV9yKdYCRR-dTXkkTX0LrWtcWs1vfxLGc,15962
 mxcubecore/HardwareObjects/XSDataAutoprocv1_0.py,sha256=3SBTdJT2oWtOAdBf59K6AHQVXI19Ww9vPQeMJpho2vA,314090
 mxcubecore/HardwareObjects/XSDataCommon.py,sha256=o7-xhEoDABuVlQ7Q3ZztfiKURTfmw9WruPm3hYhtLzs,210266
@@ -461,14 +461,14 @@ mxcubecore/queue_entry/test_collection.py,sha256=KidatI31KJ11FGrBNxG9SOvDEdLYaoC
 mxcubecore/queue_entry/xray_centering.py,sha256=bicHc3ShlSakQ7xIdCw8rqrwec6PMt7JDqN6k38tMuE,4150
 mxcubecore/queue_entry/xray_centering2.py,sha256=ZAwpmb39LGTNeBeZegzNcl-_x0yXWciqNxn4DiC-gms,2976
 mxcubecore/queue_entry/xrf_spectrum.py,sha256=bZc9Ju-BW34pNSL9RN00bvT8ZVcdG9744N2M36Rvkps,5298
-mxcubecore/saferef.py,sha256=IcrRL_oKVUKgYS4JnfNss5yf3tDTDbC7tNpvB_vwpec,7213
+mxcubecore/saferef.py,sha256=0ORlWs-VsGaUxVCVkF9u1qP_4aOL5bwMcwaIh8Bmqzs,6984
 mxcubecore/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUOk,4513
 mxcubecore/utils/qt_import.py,sha256=sfuzul_J1Jw3by40KulRzAOceoS4tOnkms_1s1BzTKQ,14739
 mxcubecore/utils/tango.py,sha256=vwEVrIrWKEFaeaJUz3xbaC7XWHY8ZeJ-pfcSrTfZPIE,2114
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.394.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.394.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.394.0.dist-info/METADATA,sha256=6q_iL6dXhE1J6kyNM2ET-oZ2HQUqy-b1iRPb0E_heik,4259
-mxcubecore-1.394.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.394.0.dist-info/RECORD,,
+mxcubecore-1.396.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.396.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.396.0.dist-info/METADATA,sha256=L9EP6bsfJK_Ih5cLSpMgs3JE0kUMihck2gEknDt2yKQ,4259
+mxcubecore-1.396.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.396.0.dist-info/RECORD,,