mxcubecore 1.392.0__tar.gz → 1.394.0__tar.gz

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/PKG-INFO

@@ -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

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/BaseHardwareObjects.py

@@ -486,7 +486,7 @@ class HardwareObjectNode:
         try:
             index = self.__objects_names.index(object_name)
         except ValueError:
-            pass
+            logging.getLogger("HWR").exception("")
         else:
             for obj in self.__objects[index]:
                 yield obj

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/Epics.py

@@ -141,7 +141,7 @@ class EpicsCommand(CommandObject):
         try:
             callback = self.__value_changed_callback_ref()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         else:
             if callback is not None:
                 callback(value)
@@ -155,7 +155,7 @@ class EpicsCommand(CommandObject):
             try:
                 poller.restart(1000)
             except Exception:
-                pass
+                logging.getLogger("HWR").exception("")
 
     def get_pv_value(self):
         """wrapper function to pv.get() in order to supply additional named parameter"""

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/Pool.py

@@ -141,9 +141,9 @@ def process_tango_events():
                     try:
                         receiver_cb(event.attr_value.value)
                     except AttributeError:
-                        pass
+                        logging.getLogger("HWR").exception("")
             except KeyError:
-                pass
+                logging.getLogger("HWR").exception("")
 
 
 class PoolChannel(ChannelObject):
@@ -217,7 +217,7 @@ class PoolChannel(ChannelObject):
                                 self.attribute_name, PyTango.EventType.CHANGE, self, []
                             )
                         except PyTango.EventSystemFailed:
-                            pass
+                            logging.getLogger("HWR").exception("")
 
     def push_event(self, event):
         PoolChannel._eventReceivers[id(event)] = BoundMethodWeakref(self.update)
@@ -250,7 +250,7 @@ class PoolChannel(ChannelObject):
         try:
             s = self.device.State()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         else:
             if s == PyTango.DevState.OFF:
                 return

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/Sardana.py

@@ -84,9 +84,9 @@ def processSardanaEvents():
                     try:
                         gevent.spawn(receiver_cb, ev)
                     except AttributeError:
-                        pass
+                        logging.getLogger("HWR").exception("")
             except KeyError:
-                pass
+                logging.getLogger("HWR").exception("")
 
 
 def wait_end_of_command(cmdobj):
@@ -188,6 +188,8 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
                 "  - Wrong format for macro arguments. Macro is %s / args are (%s)"
                 % (self.macro_format, str(args))
             )
+
+            logging.getLogger("HWR").exception("")
             return
 
         try:
@@ -399,6 +401,8 @@ class SardanaChannel(ChannelObject, SardanaObject):
             self.attribute = Attribute(self.model)
         except DevFailed as traceback:
             self.imported = False
+
+            logging.getLogger("HWR").exception("")
             return
 
         # read information
@@ -471,7 +475,7 @@ class SardanaChannel(ChannelObject, SardanaObject):
             self.emit("update", self.value)
         except AttributeError:
             # No value in data... this is probably a connection error
-            pass
+            logging.getLogger("HWR").exception("")
 
     def is_connected(self):
         return self.attribute is not None

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/Taco.py

@@ -104,7 +104,7 @@ class TacoCommand(CommandObject):
         try:
             callback = self.__value_changed_callback_ref()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         else:
             if callback is not None:
                 callback(device_name, value)
@@ -116,7 +116,7 @@ class TacoCommand(CommandObject):
             try:
                 poller.restart(1000)
             except Exception:
-                pass
+                logging.getLogger("HWR").exception("")
 
     def poll(
         self,

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/Tango.py

@@ -133,9 +133,9 @@ def process_tango_events():
                     try:
                         gevent.spawn(receiverCb, ev.event.attr_value.value)
                     except AttributeError:
-                        pass
+                        logging.getLogger("HWR").exception("")
             except KeyError:
-                pass
+                logging.getLogger("HWR").exception("")
 
 
 class E:

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/Tine.py

@@ -82,7 +82,7 @@ class TineCommand(CommandObject):
         except IOError as strerror:
             logging.getLogger("HWR").error("%s" % strerror)
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         return result
 
     def abort(self):

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/exporter/ExporterClient.py

@@ -59,7 +59,7 @@ class ExporterClient(StandardClient):
                 tokens = msg[4:].split(PARAMETER_SEPARATOR)
                 self.on_event(tokens[0], tokens[1], int(tokens[2]))
             except Exception:
-                pass
+                logging.getLogger("HWR").exception("")
         else:
             StandardClient.on_message_received(self, msg)
 
@@ -187,7 +187,7 @@ class ExporterClient(StandardClient):
         try:
             process_return = self.__process_return(ret)
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         return process_return
 
     def read_property_as_string_array(self, prop):

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/Command/exporter/StandardClient.py

@@ -20,6 +20,7 @@
 
 """ProtocolError and StandardClient implementation"""
 
+import logging
 import socket
 import sys
 
@@ -109,7 +110,7 @@ class StandardClient:
         try:
             self.__sock.close()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         self._is_connected = False
         self.__sock = None
         self.received_msg = None
@@ -249,7 +250,7 @@ class StandardClient:
         try:
             self.on_connected()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         buffer = empty_buffer()
         mReceivedSTX = False
         while True:
@@ -288,7 +289,7 @@ class StandardClient:
         try:
             self.on_disconnected()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
 
     def __send_stream(self, cmd):
         """Send a command.

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/HardwareObjects/ALBA/ALBAAutoProcessing.py

@@ -1,4 +1,3 @@
-import logging
 import math
 import os
 import sys
@@ -28,7 +27,7 @@ class ALBAAutoProcessing(HardwareObject):
 
         self.template_dir = self.get_property("template_dir")
         var_dsname = self.get_property("variables_ds")
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "ALBAAutoProcessing INIT: var_ds=%s, template_dir=%s"
             % (var_dsname, self.template_dir)
         )
@@ -194,15 +193,13 @@ class ALBAAutoProcessing(HardwareObject):
 
     # trigger auto processing for standard collection
     def trigger_auto_processing(self, dc_pars):
-        logging.getLogger("HWR").debug(
-            " ALBAAutoProcessing. triggering auto processing."
-        )
+        self.log.debug(" ALBAAutoProcessing. triggering auto processing.")
 
         dc_id = dc_pars["collection_id"]
         output_dir = dc_pars["ednaproc_dir"]
 
-        logging.getLogger("HWR").debug("    - collection_id = %s " % dc_id)
-        logging.getLogger("HWR").debug("    - output_dir    = %s " % output_dir)
+        self.log.debug("    - collection_id = %s " % dc_id)
+        self.log.debug("    - output_dir    = %s " % output_dir)
 
         job = ALBAEdnaProcJob()
         input_file = self.input_file  # TODO

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/HardwareObjects/ALBA/ALBABackLight.py

@@ -1,4 +1,3 @@
-import logging
 import time
 
 import gevent
@@ -102,7 +101,7 @@ class ALBABackLight(HardwareObject):
             self.set_backlight_in()
             wait_ok = self.wait_backlight_in()
             if not wait_ok:
-                logging.getLogger("HWR").debug("could not set backlight in")
+                self.log.debug("could not set backlight in")
                 return
 
         level = None
@@ -112,7 +111,7 @@ class ALBABackLight(HardwareObject):
         if not level or level < self.minimum_level:
             level = self.minimum_level
 
-        logging.getLogger("HWR").debug("setting light level to : %s" % level)
+        self.log.debug("setting light level to : %s" % level)
         self.setLevel(level)
 
     def set_backlight_in(self):
@@ -124,22 +123,22 @@ class ALBABackLight(HardwareObject):
         while elapsed < timeout:
             isin = self.backlightin_channel.get_value()
             if isin == state:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "waiting for backlight took %s . In is: %s" % (elapsed, isin)
                 )
                 return True
             gevent.sleep(0.1)
             elapsed = time.time() - t0
 
-        logging.getLogger("HWR").debug("Timeout waiting for backlight In")
+        self.log.debug("Timeout waiting for backlight In")
         return False
 
     def _task_finished(self, g):
-        logging.getLogger("HWR").debug("Backlight task finished")
+        self.log.debug("Backlight task finished")
         self._task = None
 
     def _task_failed(self, g):
-        logging.getLogger("HWR").debug("Backlight task failed")
+        self.log.debug("Backlight task failed")
         self._task = None
 
     def setOff(self):

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/HardwareObjects/ALBA/ALBABeamInfo.py

@@ -19,8 +19,6 @@ beamPosChanged
 -----------------------------------------------------------------------
 """
 
-import logging
-
 from mxcubecore.BaseHardwareObjects import HardwareObject
 
 
@@ -78,7 +76,7 @@ class ALBABeamInfo(HardwareObject):
                 self.get_property("beam_divergence_horizontal")
             )
         except Exception:
-            pass
+            self.log.exception("")
 
         self.default_beam_divergence = [
             default_beam_divergence_horizontal,
@@ -182,7 +180,7 @@ class ALBABeamInfo(HardwareObject):
         Arguments :
         Return    :
         """
-        logging.getLogger("HWR").debug(" emitting beam info")
+        self.log.debug(" emitting beam info")
         if (
             self.beam_info_dict["size_x"] != 9999
             and self.beam_info_dict["size_y"] != 9999

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/HardwareObjects/ALBA/ALBACats.py

@@ -143,7 +143,7 @@ class ALBACats(Cats90):
                 )
                 return False
 
-            logging.getLogger("HWR").debug("Supervisor waiting to finish phase change")
+            self.log.debug("Supervisor waiting to finish phase change")
             time.sleep(0.2)
 
         time.sleep(0.1)
@@ -189,9 +189,7 @@ class ALBACats(Cats90):
         @return:
         """
 
-        logging.getLogger("HWR").debug(
-            "Loading sample %s / type(%s)" % (sample, type(sample))
-        )
+        self.log.debug("Loading sample %s / type(%s)" % (sample, type(sample)))
 
         ret, msg = self._check_coherence()
         if not ret:
@@ -312,7 +310,7 @@ class ALBACats(Cats90):
         # get sample selection
         selected = self.get_selected_sample()
 
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "  ==========CATS=== selected sample is %s (prev %s)"
             % (str(selected), str(sample))
         )
@@ -344,9 +342,7 @@ class ALBACats(Cats90):
             )
 
         if not self.has_loaded_sample() and self.cats_sample_on_diffr() == 1:
-            logging.getLogger("HWR").warning(
-                "  ==========CATS=== sample on diffr, loading aborted"
-            )
+            self.log.warning("  ==========CATS=== sample on diffr, loading aborted")
             self._update_state()  # remove transient states like Loading. Reflect hardware state
             raise Exception(
                 "The sample "
@@ -373,15 +369,13 @@ class ALBACats(Cats90):
         if use_ht:  # loading HT sample
             if loaded_ht == -1:  # has loaded but it is not HT
                 # first unmount (non HT)
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "  ==========CATS=== mix load/unload dewar vs HT (NOT IMPLEMENTED YET)"
                 )
                 return
 
             argin = ["2", str(sample), "0", "0", xshift, yshift, zshift]
-            logging.getLogger("HWR").warning(
-                "  ==========CATS=== about to load HT. %s" % str(argin)
-            )
+            self.log.warning("  ==========CATS=== about to load HT. %s" % str(argin))
             if loaded_ht == 1:  # has ht loaded
                 cmd_ok = self._execute_server_task(
                     self._cmdChainedLoadHT, argin, waitsafe=True
@@ -397,7 +391,7 @@ class ALBACats(Cats90):
         else:
             if loaded_ht == 1:  # has an HT sample mounted
                 # first unmount HT
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "  ==========CATS=== mix load/unload dewar vs HT (NOT IMPLEMENTED YET)"
                 )
                 return
@@ -414,7 +408,7 @@ class ALBACats(Cats90):
             stype = self.get_cassette_type(basketno)
 
             if tool != current_tool:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "  ==========CATS=== changing tool from %s to %s"
                     % (current_tool, tool)
                 )
@@ -448,7 +442,7 @@ class ALBACats(Cats90):
                 )
             else:
                 if self.read_datamatrix:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== reading barcode only possible with spine pucks"
                     )
                 read_barcode = False
@@ -460,7 +454,7 @@ class ALBACats(Cats90):
                     )
 
                 if read_barcode:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== chained load sample (barcode), sending to cats:  %s"
                         % argin
                     )
@@ -468,7 +462,7 @@ class ALBACats(Cats90):
                         self._cmdChainedLoadBarcode, argin, waitsafe=True
                     )
                 else:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== chained load sample, sending to cats:  %s"
                         % argin
                     )
@@ -477,7 +471,7 @@ class ALBACats(Cats90):
                     )
             elif loaded_ht == 0:
                 if read_barcode:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== load sample (barcode), sending to cats:  %s"
                         % argin
                     )
@@ -485,7 +479,7 @@ class ALBACats(Cats90):
                         self._cmdLoadBarcode, argin, waitsafe=True
                     )
                 else:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== load sample, sending to cats:  %s" % argin
                     )
                     cmd_ok = self._execute_server_task(
@@ -493,18 +487,18 @@ class ALBACats(Cats90):
                     )
 
         if not cmd_ok:
-            logging.getLogger("HWR").info("  LOAD Command failed on device server")
+            self.log.info("  LOAD Command failed on device server")
         elif self.auto_prepare_diff and not changing_tool:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "  AUTO_PREPARE_DIFF (On) sample changer is in safe state... preparing diff now"
             )
             # ret = self.diff_send_sampleview()
             self.go_sampleview_cmd()
-            logging.getLogger("HWR").info("     restoring detector distance")
+            self.log.info("     restoring detector distance")
             self.restore_detdist_position()
             self._wait_phase_done("SAMPLE")
         else:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "  AUTO_PREPARE_DIFF (Off) sample loading done / or changing tool (%s)"
                 % changing_tool
             )
@@ -548,7 +542,7 @@ class ALBACats(Cats90):
         loaded_num = self._chnNumLoadedSample.get_value()
 
         if loaded_lid == -1:
-            logging.getLogger("HWR").warning(
+            self.log.warning(
                 "  ==========CATS=== unload sample, no sample mounted detected"
             )
             return
@@ -561,7 +555,7 @@ class ALBACats(Cats90):
 
         argin = [str(tool), "0", xshift, yshift, zshift]
 
-        logging.getLogger("HWR").warning(
+        self.log.warning(
             "  ==========CATS=== unload sample, sending to cats:  %s" % argin
         )
         if loaded_ht == 1:

{mxcubecore-1.392.0 → mxcubecore-1.394.0}/mxcubecore/HardwareObjects/ALBA/ALBAClusterJob.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import sys
 import time
@@ -31,11 +30,11 @@ class ALBAClusterJob(object):
             return state
 
         while state in ["RUNNING", "PENDING"]:
-            logging.getLogger("HWR").debug("Job / is %s" % state)
+            self.log.debug("Job / is %s" % state)
             time.sleep(0.5)
             state = self.job.state
 
-        logging.getLogger("HWR").debug(' job finished with state: "%s"' % state)
+        self.log.debug(' job finished with state: "%s"' % state)
         return state
 
     def get_result(self, state):
@@ -68,7 +67,7 @@ class ALBAStrategyJob(ALBAClusterJob):
     sls_script = os.path.join(root, "edna-mx/strategy/edna-mx.strategy.sl")
 
     def run(self, *args):
-        logging.getLogger("HWR").debug("Starting StrategyJob - ")
+        self.log.debug("Starting StrategyJob - ")
 
         input_file, results_file, edna_directory = args
 
@@ -79,13 +78,13 @@ class ALBAStrategyJob(ALBAClusterJob):
         )
         self.job.submit()
 
-        logging.getLogger("HWR").debug("         StrategyJob - %s" % str(self.job))
+        self.log.debug("         StrategyJob - %s" % str(self.job))
 
         self.edna_directory = os.path.dirname(input_file)
         self.results_file = results_file
 
-        logging.getLogger("HWR").debug("  input file: %s" % input_file)
-        logging.getLogger("HWR").debug("  edna directory: %s" % self.edna_directory)
+        self.log.debug("  input file: %s" % input_file)
+        self.log.debug("  edna directory: %s" % self.edna_directory)
 
     def get_result(self, state):
         if state == "COMPLETED":
@@ -93,19 +92,19 @@ class ALBAStrategyJob(ALBAClusterJob):
                 self.edna_directory, "ControlInterfaceToMXCuBEv1_3_dataOutput.xml"
             )
 
-            logging.getLogger("HWR").debug("Job / state is COMPLETED")
-            logging.getLogger("HWR").debug("  looking for file: %s" % outfile)
+            self.log.debug("Job / state is COMPLETED")
+            self.log.debug("  looking for file: %s" % outfile)
             if os.path.exists(outfile):
                 job_output = open(outfile).read()
                 open(self.results_file, "w").write(job_output)
                 result = XSDataResultMXCuBE.parseFile(self.results_file)
             else:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "EDNA Job finished without success / cannot find output file "
                 )
                 result = ""
         else:
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "EDNA Job finished without success / state was %s" % (job.state)
             )
             result = ""