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

mxcubecore/HardwareObjects/mockup/MDCameraMockup.py

@@ -1,7 +1,6 @@
 """Class for cameras connected to framegrabbers run by Taco Device Servers"""
 
 import atexit
-import logging
 import os
 import signal
 import subprocess
@@ -40,7 +39,7 @@ class MDCameraMockup(BaseHardwareObjects.HardwareObject):
         self._current_stream_size = (0, 0)
 
     def init(self):
-        logging.getLogger("HWR").info("initializing camera object")
+        self.log.info("initializing camera object")
         if self.get_property("interval"):
             self.pollInterval = self.get_property("interval")
         self.stopper = False  # self.polling_timer(self.pollInterval, self.poll)
@@ -60,14 +59,14 @@ class MDCameraMockup(BaseHardwareObjects.HardwareObject):
         return self.connected
 
     def poll(self) -> None:
-        logging.getLogger("HWR").info("going to poll images")
+        self.log.info("going to poll images")
         while not self.stopper:
             time.sleep(1)
             try:
                 img = open(self.image, "rb").read()
                 self.emit("imageReceived", img, 659, 493)
             except Exception:
-                logging.getLogger("HWR").exception("Could not read image")
+                self.log.exception("Could not read image")
 
     def imageUpdated(self, value) -> None:
         print("<HW> got new image")
@@ -119,7 +118,7 @@ class MDCameraMockup(BaseHardwareObjects.HardwareObject):
         return (width, height, scale)
 
     def clean_up(self):
-        logging.getLogger("HWR").info("Shutting down video_stream...")
+        self.log.info("Shutting down video_stream...")
         os.kill(self._video_stream_process.pid, signal.SIGTERM)
 
     def start_video_stream_process(self) -> None:
@@ -160,7 +159,7 @@ class MDCameraMockup(BaseHardwareObjects.HardwareObject):
                 for p in ps:
                     p.kill()
             except psutil.NoSuchProcess:
-                pass
+                self.log.exception("")
 
             self._video_stream_process = None
 

mxcubecore/HardwareObjects/mockup/MicrodiffInOutMockup.py

@@ -45,7 +45,7 @@ class MicrodiffInOutMockup(HardwareObject):
             tt = float(self.get_property("timeout"))
             self.timeout = tt
         except Exception:
-            pass
+            self.log.exception("")
 
         self.moves = dict((self.states[k], k) for k in self.states)
 

mxcubecore/HardwareObjects/mockup/MultiCollectMockup.py

@@ -101,7 +101,7 @@ class MultiCollectMockup(AbstractMultiCollect, HardwareObject):
             not failed,
             failed_msg if failed else "Data collection successful",
         )
-        logging.getLogger("HWR").info("data collection successful in loop")
+        self.log.info("data collection successful in loop")
         self.emit("collectReady", (True,))
 
     @task

mxcubecore/HardwareObjects/mockup/ShapeHistoryMockup.py

@@ -17,7 +17,6 @@ between two Point objects.
 
 """
 
-import logging
 import os
 
 from mxcubecore.BaseHardwareObjects import HardwareObject
@@ -50,7 +49,7 @@ class ShapeHistoryMockup(HardwareObject):
         :returns: None
         """
         if self._drawing:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Setting previous drawing:" + str(self._drawing) + " to " + str(drawing)
             )
 

mxcubecore/HardwareObjects/mockup/XRFMockup.py

@@ -1,4 +1,3 @@
-import logging
 import time
 
 import gevent
@@ -48,7 +47,7 @@ class XRFMockup(HardwareObject):
         )
         raw_data = s1 + s2
 
-        logging.getLogger("HWR").info("XRF Spectrum Started, task id: %d" % blsample_id)
+        self.log.info("XRF Spectrum Started, task id: %d" % blsample_id)
         self.scanning = True
         self.emit("xrfSpectrumStarted", ())
         with cleanup(self.ready_event.set):
@@ -85,9 +84,7 @@ class XRFMockup(HardwareObject):
                     self.emit("plot_data", {"id": scan_id, "data": aux})
                     if divmod(i, SCAN_LENGTH / 10)[1] == 0:
                         progress = i / float(SCAN_LENGTH)
-                        logging.getLogger("HWR").info(
-                            "XRF Spectrum Progress %f" % progress
-                        )
+                        self.log.info("XRF Spectrum Progress %f" % progress)
                         self.emit("xrf_task_progress", (blsample_id, progress))
 
                     gevent.sleep(0.02)
@@ -115,5 +112,5 @@ class XRFMockup(HardwareObject):
                 res.append(arr[0].tolist())
 
             self.emit("xrfSpectrumFinished", (res, mcaCalib, mcaConfig))
-            logging.getLogger("HWR").info("XRF Spectrum Finished")
+            self.log.info("XRF Spectrum Finished")
             del self.__scan_data[scan_id]

mxcubecore/TaskUtils.py

@@ -77,6 +77,8 @@ class wrap_errors(object):
             return func(*args, **kwargs)
         except Exception:
             sys.excepthook(*sys.exc_info())
+
+            logging.getLogger("HWR").exception("")
             return TaskException(*sys.exc_info())
 
     def __str__(self):

mxcubecore/queue_entry/base_queue_entry.py

@@ -640,7 +640,7 @@ class TaskGroupQueueEntry(BaseQueueEntry):
                         "queue_entry"
                     ].execute()
                 except Exception:
-                    pass
+                    logging.getLogger("HWR").exception("")
                 self.interleave_items[item["collect_index"]][
                     "queue_entry"
                 ].post_execute()
@@ -804,7 +804,7 @@ class SampleQueueEntry(BaseQueueEntry):
             programs = HWR.beamline.collect["auto_processing"]
             autoprocessing.start(programs, "end_multicollect", params)
         except KeyError:
-            pass
+            logging.getLogger("HWR").exception("")
 
         self._set_background_color()
         self._view.setText(1, "")

mxcubecore/queue_entry/energy_scan.py

@@ -195,7 +195,7 @@ class EnergyScanQueueEntry(BaseQueueEntry):
         try:
             energy_scan.result.data = HWR.beamline.energy_scan.get_scan_data()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
 
         if (
             sample.crystals[0].energy_scan_result.peak

mxcubecore/saferef.py

@@ -1,6 +1,7 @@
 """Refactored 'safe reference from dispatcher.py"""
 
 import collections
+import logging
 import traceback
 import weakref
 
@@ -115,7 +116,7 @@ class BoundMethodWeakref(object):
             try:
                 del self.__class__._all_instances[self.key]
             except KeyError:
-                pass
+                logging.getLogger("HWR").exception("")
             for function in methods:
                 try:
                     if isinstance(function, collections.abc.Callable):

mxcubecore/utils/qt_import.py

@@ -68,6 +68,7 @@ splot is licensed under LGPL license
 
 """
 
+import logging
 import os
 import sys
 
@@ -99,9 +100,9 @@ try:
             if m:
                 mpl_version_no[2] = int(m.group("release"))
         except BaseException:
-            pass
+            logging.getLogger("HWR").exception("")
 except BaseException:
-    pass
+    logging.getLogger("HWR").exception("")
 
 if "--pyqt5" in sys.argv:
     qt_variant = "PyQt5"
@@ -239,12 +240,12 @@ if (qt_variant == "PyQt5") or (qt_variant is None and not qt_imported):
         ver = _ver + ["0"] * (3 - len(_ver))
         pyqt_version_no = list(map(int, ver))[:3]
     except ImportError:
-        pass
+        logging.getLogger("HWR").exception("")
 
     try:
         from PyQt5.QtWebKit import QWebPage
     except ImportError:
-        pass
+        logging.getLogger("HWR").exception("")
 
 #
 # PyQt4
@@ -380,12 +381,12 @@ if (qt_variant == "PyQt4") or (qt_variant is None and not qt_imported):
         ver = _ver + ["0"] * (3 - len(_ver))
         pyqt_version_no = list(map(int, ver))[:3]
     except BaseException:
-        pass
+        logging.getLogger("HWR").exception("")
 
     try:
         from PyQt4.QtWebKit import QWebPage
     except ImportError:
-        pass
+        logging.getLogger("HWR").exception("")
 
 #
 # PySide
@@ -423,7 +424,7 @@ if (qt_variant == "PySide") or (qt_variant is None and not qt_imported):
             return ui
 
     except BaseException:
-        pass
+        logging.getLogger("HWR").exception("")
 
 #
 #  Matplotlib backend assignment

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

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