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

mxcubecore/HardwareObjects/EMBL/TINEMotor.py

@@ -63,7 +63,7 @@ class TINEMotor(AbstractMotor):
                 if self.get_property("default_limits"):
                     self.update_limits(eval(self.get_property("default_limits")))
             except Exception:
-                pass
+                self.log.exception("")
 
         self.chan_position = self.get_channel_object("axisPosition")
         if self.chan_position is not None:
@@ -92,7 +92,7 @@ class TINEMotor(AbstractMotor):
         try:
             self.step_limits = eval(self.get_property("stepLimits"))
         except Exception:
-            pass
+            self.log.exception("")
 
     def connected(self):
         """

mxcubecore/HardwareObjects/EMBLFlexHCD.py

@@ -422,7 +422,7 @@ class EMBLFlexHCD(SampleChanger):
         finally:
             for msg in self.get_robot_exceptions():
                 if msg is not None:
-                    logging.getLogger("HWR").error(msg)
+                    self.log.error(msg)
 
         # if res:
         #    self.prepare_centring()
@@ -458,7 +458,7 @@ class EMBLFlexHCD(SampleChanger):
         finally:
             for msg in self.get_robot_exceptions():
                 if msg is not None:
-                    logging.getLogger("HWR").error(msg)
+                    self.log.error(msg)
 
     def get_gripper(self):
         gripper_type = self._execute_cmd_exporter("get_gripper_type", attribute=True)
@@ -535,7 +535,7 @@ class EMBLFlexHCD(SampleChanger):
         try:
             _tt = time.time()
             self._wait_busy(300)
-            logging.getLogger("HWR").info(f"Waited SC activity {time.time() - _tt}")
+            self.log.info(f"Waited SC activity {time.time() - _tt}")
         except Exception:
             for msg in self.get_robot_exceptions():
                 logging.getLogger("user_level_log").error(msg)
@@ -584,7 +584,7 @@ class EMBLFlexHCD(SampleChanger):
 
         for msg in self.get_robot_exceptions():
             if msg is not None:
-                logging.getLogger("HWR").error(msg)
+                self.log.error(msg)
                 logging.getLogger("user_level_log").error(msg)
 
         return self._set_loaded_sample_and_prepare(loaded_sample, previous_sample)
@@ -609,7 +609,7 @@ class EMBLFlexHCD(SampleChanger):
 
         for msg in self.get_robot_exceptions():
             if msg is not None:
-                logging.getLogger("HWR").error(msg)
+                self.log.error(msg)
                 logging.getLogger("user_level_log").error(msg)
 
         if loaded_sample == (-1, -1, -1):

mxcubecore/HardwareObjects/EMBLFlexHarvester.py

@@ -208,7 +208,7 @@ class EMBLFlexHarvester(EMBLFlexHCD):
         try:
             _tt = time.time()
             self._wait_busy(300)
-            logging.getLogger("HWR").info(f"Waited SC activity {time.time() - _tt}")
+            self.log.info(f"Waited SC activity {time.time() - _tt}")
         except Exception:
             logging.getLogger("user_level_log").error(
                 "ERROR While Waited SC activity to start"
@@ -237,7 +237,7 @@ class EMBLFlexHarvester(EMBLFlexHCD):
                 logging.getLogger("user_level_log").error(
                     "ERROR While SC activity After Loaded Sample "
                 )
-                logging.getLogger("HWR").error(msg)
+                self.log.error(msg)
                 logging.getLogger("user_level_log").error(msg)
                 # Temp: In Harvester mode any robot Exception is consider as Loading failed
                 # Except Pin Cleaning Station Exception

mxcubecore/HardwareObjects/ESRF/ESRFBeam.py

@@ -40,8 +40,6 @@ __copyright__ = """ Copyright © by the MXCuBE collaboration """
 __license__ = "LGPLv3+"
 
 
-import logging
-
 from mxcubecore import HardwareRepository as HWR
 from mxcubecore.HardwareObjects.abstract.AbstractBeam import AbstractBeam, BeamShape
 
@@ -137,7 +135,7 @@ class ESRFBeam(AbstractBeam):
             if value.name != "UNKNOWN":
                 return list(value.value), value.name
         except AttributeError:
-            logging.getLogger("HWR").info("Could not read beam size")
+            self.log.info("Could not read beam size")
         return [-1, -1], "UNKNOWN"
 
     def _get_slits_size(self) -> dict[str, float]:
@@ -354,7 +352,7 @@ class ESRFBeam(AbstractBeam):
             _beam_position_on_screen = HWR.beamline.diffractometer.get_beam_position()
         except AttributeError:
             msg = "Could not read beam position from MD, using OAV center"
-            logging.getLogger("HWR").warning(msg)
+            self.log.warning(msg)
             _beam_position_on_screen = (
                 HWR.beamline.sample_view.camera.get_width() / 2,
                 HWR.beamline.sample_view.camera.get_height() / 2,
@@ -398,4 +396,4 @@ class ESRFBeam(AbstractBeam):
                 if self._monitorbeam_obj.get_value().value:
                     self._beam_check_obj.wait_for_beam(timeout)
             except AttributeError:
-                pass
+                self.log.exception("")

mxcubecore/HardwareObjects/ESRF/ESRFBeamInfo.py

@@ -1,5 +1,3 @@
-import logging
-
 from mxcubecore import HardwareRepository as HWR
 from mxcubecore.HardwareObjects import BeamInfo
 
@@ -37,9 +35,7 @@ class ESRFBeamInfo(BeamInfo.BeamInfo):
         if beam_position:
             self.beam_position = tuple(map(float, beam_position.split()))
         else:
-            logging.getLogger("HWR").warning(
-                "ESRFBeamInfo: " + "beam position not configured"
-            )
+            self.log.warning("ESRFBeamInfo: " + "beam position not configured")
         self.difrractometer_hwobj = self.get_object_by_role("difrractometer")
         self.flux = self.get_object_by_role("flux")
         self.beam_definer = self.get_object_by_role("beam_definer")

mxcubecore/HardwareObjects/ESRF/ESRFBeamlineActions.py

@@ -69,7 +69,7 @@ class ESRFBeamlineActions(BeamlineActions):
                     action = getattr(controller, key)
                     self.ctrl_list.append(ControllerCommand(name, action))
         except KeyError:
-            pass
+            self.log.exception("")
 
         try:
             hwobj_cmd_roles = ast.literal_eval(
@@ -86,7 +86,7 @@ class ESRFBeamlineActions(BeamlineActions):
                     except:
                         pass
         except AttributeError:
-            pass
+            self.log.exception("")
 
     def get_commands(self):
         """Get which objects to be used in the GUI

mxcubecore/HardwareObjects/ESRF/ESRFEnergyScan.py

@@ -110,7 +110,7 @@ class ESRFEnergyScan(AbstractEnergyScan):
         self.ctrl = self.get_object_by_role("controller")
         self.ready_event = event.Event()
         if HWR.beamline.lims is None:
-            logging.getLogger("HWR").warning(
+            self.log.warning(
                 "EnergyScan: you should specify the database hardware object"
             )
 
@@ -273,7 +273,7 @@ class ESRFEnergyScan(AbstractEnergyScan):
 
         msg = f"Chooch results: pk = {pk}, ip = {ip}. rm = {rm}.\n"
         msg += f"Theoretical edge: {th_edge}."
-        logging.getLogger("HWR").info(msg)
+        self.log.info(msg)
 
         # +- shift from the theoretical edge [eV]
         edge_shift = 50
@@ -307,7 +307,7 @@ class ESRFEnergyScan(AbstractEnergyScan):
         self.energy_scan_parameters["inflectionFPrime"] = fp_infl
         self.energy_scan_parameters["inflectionFDoublePrime"] = fpp_infl
 
-        logging.getLogger("HWR").info("Saving png")
+        self.log.info("Saving png")
         # prepare to save png files
         title = "%10s  %6s  %6s\n%10s  %6.2f  %6.2f\n%10s  %6.2f  %6.2f" % (
             "energy",

mxcubecore/HardwareObjects/ESRF/ESRFMetadataManagerClient.py

@@ -253,7 +253,7 @@ class MXCuBEMetadataClient(object):
                 )
                 smtp.quit()
             except Exception:
-                pass
+                logging.getLogger("HWR").exception("")
         return errorMessage
 
     def start(self, data_collect_parameters):

mxcubecore/HardwareObjects/ESRF/ESRFMultiCollect.py

@@ -181,7 +181,7 @@ class ESRFMultiCollect(AbstractMultiCollect, HardwareObject):
             self.stop_oscillation()
             HWR.beamline.detector.stop_acquisition()
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
     def queue_finished_cleanup(self):
         logging.getLogger("user_level_log").info("Queue execution finished")
@@ -209,13 +209,13 @@ class ESRFMultiCollect(AbstractMultiCollect, HardwareObject):
                     continue
                 motor_positions_copy[motor] = position
 
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Moving motor '%s' to %f", motor.get_motor_mnemonic(), position
             )
             motor.set_value(position)
 
         while any([motor.motorIsMoving() for motor in motor_positions_copy]):
-            logging.getLogger("HWR").info("Waiting for end of motors motion")
+            self.log.info("Waiting for end of motors motion")
             time.sleep(0.02)
 
     def open_safety_shutter(self):
@@ -226,7 +226,7 @@ class ESRFMultiCollect(AbstractMultiCollect, HardwareObject):
                     HWR.beamline.safety_shutter.VALUES.OPEN, timeout=10
                 )
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
     def safety_shutter_opened(self):
         state = False
@@ -234,7 +234,7 @@ class ESRFMultiCollect(AbstractMultiCollect, HardwareObject):
         try:
             state = HWR.beamline.safety_shutter.get_value().name == "OPEN"
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             state = True
 
         return state
@@ -247,7 +247,7 @@ class ESRFMultiCollect(AbstractMultiCollect, HardwareObject):
                     HWR.beamline.safety_shutter.VALUES.CLOSED
                 )
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
     @task
     def prepare_intensity_monitors(self):
@@ -455,7 +455,7 @@ class ESRFMultiCollect(AbstractMultiCollect, HardwareObject):
         try:
             _gaps = HWR.beamline.config.undulators
         except Exception:
-            logging.getLogger("HWR").exception("Could not get undulator gaps")
+            self.log.exception("Could not get undulator gaps")
         all_gaps.clear()
         for key in _gaps:
             if "_Position" in key:

mxcubecore/HardwareObjects/ESRF/ESRFPhotonFlux.py

@@ -33,8 +33,6 @@ Example xml_ configuration:
     controller: bliss.yaml
 """
 
-import logging
-
 from gevent import sleep, spawn
 
 from mxcubecore import HardwareRepository as HWR
@@ -62,17 +60,13 @@ class ESRFPhotonFlux(AbstractFlux):
             self._flux_calc = self.controller.CalculateFlux()
             self._flux_calc.init()
         except AttributeError:
-            logging.getLogger("HWR").exception(
-                "Could not get flux calculation from BLISS"
-            )
+            self.log.exception("Could not get flux calculation from BLISS")
         counter_name = self.get_property("counter_name")
 
         if counter_name:
             self._counter = getattr(self.controller, counter_name)
         else:
-            logging.getLogger("HWR").exception(
-                "Counter to read the flux is not configured"
-            )
+            self.log.exception("Counter to read the flux is not configured")
 
         try:
             HWR.beamline.safety_shutter.connect("stateChanged", self.update_value)

mxcubecore/HardwareObjects/ESRF/ESRFSC3.py

@@ -1,7 +1,6 @@
 """ESRF SC3 Sample Changer Hardware Object"""
 
 import functools
-import logging
 
 import SC3
 
@@ -40,7 +39,7 @@ class ESRFSC3(SC3.SC3):
         try:
             self.operationalFlagsChanged(chan)
         except Exception:
-            logging.getLogger("HWR").exception(
+            self.log.exception(
                 "%s: error getting SC vs MD operational flags" % self.name()
             )
 
@@ -53,7 +52,7 @@ class ESRFSC3(SC3.SC3):
 
     def __getSample(self, sample_id, sample_location):
         if sample_id and sample_location:
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "%s: both sample barcode and location provided, discarding barcode...",
                 self.name(),
             )
@@ -103,10 +102,10 @@ class ESRFSC3(SC3.SC3):
                     )
 
                 if loaded:
-                    logging.getLogger("HWR").debug("%s: sample is loaded", self.name())
+                    self.log.debug("%s: sample is loaded", self.name())
 
                     if self.prepareCentringAfterLoad and prepareCentring:
-                        logging.getLogger("HWR").debug(
+                        self.log.debug(
                             "%s: preparing minidiff for sample centring", self.name()
                         )
                         self.emit("stateChanged", SC3.SampleChangerState.Moving)
@@ -125,7 +124,7 @@ class ESRFSC3(SC3.SC3):
         pass
 
     def __load_sample(self, holderLength, sample_id, sample_location):
-        logging.getLogger("HWR").debug("%s: in load_sample", self.name())
+        self.log.debug("%s: in load_sample", self.name())
 
         sample = self.__getSample(sample_id, sample_location)
 
@@ -134,7 +133,7 @@ class ESRFSC3(SC3.SC3):
 
         if not holderLength:
             holderLength = 22
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "%s: loading sample: using default holder length (%d mm)",
                 self.name(),
                 holderLength,
@@ -185,9 +184,7 @@ class ESRFSC3(SC3.SC3):
                     )
 
                 if unloaded:
-                    logging.getLogger("HWR").debug(
-                        "%s: sample has been unloaded", self.name()
-                    )
+                    self.log.debug("%s: sample has been unloaded", self.name())
 
                     self.emit("statusChanged", "Ready")
 
@@ -199,7 +196,7 @@ class ESRFSC3(SC3.SC3):
 
         if not holderLength:
             holderLength = 22
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "%s: unloading sample: using default holder length (%d mm)",
                 self.name(),
                 holderLength,
@@ -236,9 +233,7 @@ class ESRFSC3(SC3.SC3):
         try:
             val = int(val)
         except Exception:
-            logging.getLogger("HWR").exception(
-                "%s: error reading operational flags" % self.name()
-            )
+            self.log.exception("%s: error reading operational flags" % self.name())
             return
 
         old_sc_can_load = self.lastOperationalFlags & ESRFSC3.FLAG_SC_CAN_LOAD
@@ -274,9 +269,7 @@ class ESRFSC3(SC3.SC3):
         try:
             self.unlockMinidiffMotors()
         except Exception:
-            logging.getLogger("HWR").exception(
-                "%s: error unlocking minidiff motors" % self.name()
-            )
+            self.log.exception("%s: error unlocking minidiff motors" % self.name())
             return False
         return True
 
@@ -285,7 +278,7 @@ class ESRFSC3(SC3.SC3):
         try:
             r=self._moveToLoadingPosition()
         except:
-            logging.getLogger("HWR").exception("%s: error moving sample changer to loading position" % self.name())
+            self.log.exception("%s: error moving sample changer to loading position" % self.name())
             return False
         return True
     """

mxcubecore/HardwareObjects/ESRF/ID29HutchTrigger.py

@@ -26,9 +26,7 @@ class ID29HutchTrigger(BaseHardwareObjects.HardwareObject):
             self.device = PyTango.gevent.DeviceProxy(self.get_property("tangoname"))
         except PyTango.DevFailed as traceback:
             last_error = traceback[-1]
-            logging.getLogger("HWR").error(
-                "%s: %s", str(self.name()), last_error["desc"]
-            )
+            self.log.error("%s: %s", str(self.name()), last_error["desc"])
             self.device = None
 
         self.pollingTask = None
@@ -42,6 +40,8 @@ class ID29HutchTrigger(BaseHardwareObjects.HardwareObject):
             self.card, self.channel = map(int, PSSinfo.split("/"))
         except Exception:
             logging.getLogger().error("%s: cannot find PSS number", self.name())
+
+            self.log.exception("")
             return
 
         if self.device is not None:

mxcubecore/HardwareObjects/ESRF/MD2MultiCollect.py

@@ -22,7 +22,7 @@ class MD2MultiCollect(ESRFMultiCollect):
             comment = HWR.beamline.sample_changer.get_crystal_id()
             data_collect_parameters["comment"] = comment
         except Exception:
-            pass
+            self.log.exception("")
 
     @task
     def get_beam_size(self):
@@ -67,7 +67,7 @@ class MD2MultiCollect(ESRFMultiCollect):
         try:
             diffr.open_detector_cover()
         except Exception:
-            logging.getLogger("HWR").exception("Could not open detector cover")
+            self.log.exception("Could not open detector cover")
         """
         try:
             detcover = self.get_object_by_role("controller").detcover
@@ -75,7 +75,7 @@ class MD2MultiCollect(ESRFMultiCollect):
             if detcover.state == "IN":
                 detcover.set_out(10)
         except:
-            logging.getLogger("HWR").exception("Could not open detector cover")
+            self.log.exception("Could not open detector cover")
         """
 
         # send again the command as MD2 software only handles one
@@ -114,7 +114,7 @@ class MD2MultiCollect(ESRFMultiCollect):
 
             if sequence_trigger:
                 msg = "Using LIMA sequnce trigger mode for Eiger"
-                logging.getLogger("HWR").info(msg)
+                self.log.info(msg)
                 mesh_total_nb_frames = self.mesh_num_lines
             else:
                 mesh_total_nb_frames = self.mesh_total_nb_frames

mxcubecore/HardwareObjects/ESRF/SSXICATLIMS.py

@@ -1,5 +1,4 @@
 import json
-import logging
 import pathlib
 
 from mxcubecore import HardwareRepository as HWR
@@ -18,7 +17,7 @@ class SSXICATLIMS(ICATLIMS):
         pass
 
     def finalize_data_collection(self, parameters):
-        logging.getLogger("HWR").info("Storing data to ICAT")
+        self.log.info("Storing data to ICAT")
         collection_parameters = parameters["collection_parameters"]
         beamline_parameters = parameters["beamline_parameters"]
         data_path = parameters["data_path"]
@@ -32,10 +31,14 @@ class SSXICATLIMS(ICATLIMS):
                 "MX_beamSizeAtSampleY": beamline_parameters.beam_size_y,
                 "MX_detectorDistance": beamline_parameters.detector_distance,
                 "MX_directory": data_path,
-                "MX_exposureTime": collection_parameters.user_collection_parameters.exp_time,
+                "MX_exposureTime": (
+                    collection_parameters.user_collection_parameters.exp_time
+                ),
                 "MX_flux": extra_lims_values.flux_start,
                 "MX_fluxEnd": extra_lims_values.flux_end,
-                "MX_numberOfImages": collection_parameters.collection_parameters.num_images,
+                "MX_numberOfImages": (
+                    collection_parameters.collection_parameters.num_images
+                ),
                 "MX_resolution": beamline_parameters.resolution,
                 "MX_transmission": beamline_parameters.transmission,
                 "MX_xBeam": beamline_parameters.beam_x,
@@ -63,7 +66,7 @@ class SSXICATLIMS(ICATLIMS):
             icat_metadata_path = pathlib.Path(data_path) / "metadata.json"
             with open(icat_metadata_path, "w") as f:
                 f.write(json.dumps(data, indent=4))
-                logging.getLogger("HWR").info(f"Wrote {icat_metadata_path}")
+                self.log.info(f"Wrote {icat_metadata_path}")
 
         except Exception as e:
-            logging.getLogger("HWR").exception("Failed uploading to ICAT (%s)", e)
+            self.log.exception("Failed uploading to ICAT (%s)", e)

mxcubecore/HardwareObjects/EdnaWorkflow.py

@@ -97,12 +97,12 @@ class EdnaWorkflow(HardwareObject):
         return self.command_failed
 
     def set_command_failed(self, *args):
-        logging.getLogger("HWR").error("Workflow '%s' Tango command failed!", args[1])
+        self.log.error("Workflow '%s' Tango command failed!", args[1])
         self.command_failed = True
 
     def state_changed(self, new_value):
         new_value = str(new_value)
-        logging.getLogger("HWR").debug(f"{self.name}: state changed to {new_value}")
+        self.log.debug(f"{self.name}: state changed to {new_value}")
         self.emit("stateChanged", (new_value,))
 
     def workflow_end(self):
@@ -155,7 +155,7 @@ class EdnaWorkflow(HardwareObject):
 
     def abort(self):
         self.generateNewToken()
-        logging.getLogger("HWR").info("Aborting current workflow")
+        self.log.info("Aborting current workflow")
         # If necessary unblock dialog
         if not self.gevent_event.is_set():
             self.gevent_event.set()
@@ -164,11 +164,11 @@ class EdnaWorkflow(HardwareObject):
             abort_URL = (
                 f"http://{self.bes_host}:{self.bes_port}/ABORT/{self.bes_workflow_id}"
             )
-            logging.getLogger("HWR").info("BES abort web service URL: %r", abort_URL)
+            self.log.info("BES abort web service URL: %r", abort_URL)
             response = requests.get(abort_URL)
             if response.status_code == 200:
                 workflow_status = response.text
-                logging.getLogger("HWR").info(
+                self.log.info(
                     "BES workflow id %s: %s", self.bes_workflow_id, workflow_status
                 )
         self.state.value = "ON"
@@ -221,7 +221,7 @@ class EdnaWorkflow(HardwareObject):
 
         xml_rpc_server = HWR.beamline.xml_rpc_server
         if xml_rpc_server is None:
-            logging.getLogger("HWR").warning("No XMLRPCServer configured")
+            self.log.warning("No XMLRPCServer configured")
             return
 
         logging.info(
@@ -256,15 +256,13 @@ class EdnaWorkflow(HardwareObject):
         }
 
         start_URL = f"http://{self.bes_host}:{self.bes_port}/RUN/{self.workflow_name}"
-        logging.getLogger("HWR").info("BES start URL: %r", start_URL)
+        self.log.info("BES start URL: %r", start_URL)
         response = requests.post(start_URL, json=self.dict_parameters)
         if response.status_code == 200:
             self.state.value = "RUNNING"
             request_id = response.text
-            logging.getLogger("HWR").info(
-                "Workflow started, BES request id: %r", request_id
-            )
+            self.log.info("Workflow started, BES request id: %r", request_id)
             self.bes_workflow_id = request_id
         else:
-            logging.getLogger("HWR").error("Workflow didn't start!")
+            self.log.error("Workflow didn't start!")
             self.state.value = "ON"

mxcubecore/HardwareObjects/Energy.py

@@ -36,22 +36,22 @@ class Energy(HardwareObject):
         try:
             self.energy_motor = self.get_object_by_role("energy")
         except KeyError:
-            logging.getLogger("HWR").warning("Energy: error initializing energy motor")
+            self.log.warning("Energy: error initializing energy motor")
 
         try:
             self.default_en = self.get_property("default_energy")
         except KeyError:
-            logging.getLogger("HWR").warning("Energy: no default energy")
+            self.log.warning("Energy: no default energy")
 
         try:
             self.tunable = self.get_property("tunable_energy")
         except KeyError:
-            logging.getLogger("HWR").warning("Energy: will set to fixed energy")
+            self.log.warning("Energy: will set to fixed energy")
 
         try:
             self.ctrl = self.get_object_by_role("controller")
         except KeyError:
-            logging.getLogger("HWR").info("No controller used")
+            self.log.info("No controller used")
 
         if self.energy_motor is not None:
             self.energy_motor.connect("valueChanged", self.energyPositionChanged)
@@ -65,9 +65,7 @@ class Energy(HardwareObject):
             try:
                 return self.energy_motor.get_value()
             except Exception:
-                logging.getLogger("HWR").exception(
-                    "EnergyHO: could not read current energy"
-                )
+                self.log.exception("EnergyHO: could not read current energy")
                 return None
         return self.default_en
 
@@ -78,7 +76,7 @@ class Energy(HardwareObject):
         return None
 
     def get_limits(self):
-        logging.getLogger("HWR").debug("Get energy limits")
+        self.log.debug("Get energy limits")
         if not self.tunable:
             energy = self.get_value()
             return (energy, energy)
@@ -88,14 +86,12 @@ class Energy(HardwareObject):
                 self.en_lims = self.energy_motor.get_limits()
                 return self.en_lims
             except Exception:
-                logging.getLogger("HWR").exception(
-                    "EnergyHO: could not read energy motor limits"
-                )
+                self.log.exception("EnergyHO: could not read energy motor limits")
                 return None
         return None
 
     def get_wavelength_limits(self):
-        logging.getLogger("HWR").debug("Get wavelength limits")
+        self.log.debug("Get wavelength limits")
         if not self.tunable:
             return None
         self.en_lims = self.get_limits()
@@ -154,16 +150,16 @@ class Energy(HardwareObject):
         self.emit("moveEnergyFinished", ())
 
     def checkLimits(self, value):
-        logging.getLogger("HWR").debug("Checking the move limits")
+        self.log.debug("Checking the move limits")
         if self.get_limits():
             if value >= self.en_lims[0] and value <= self.en_lims[1]:
-                logging.getLogger("HWR").info("Limits ok")
+                self.log.info("Limits ok")
                 return True
             logging.getLogger("user_level_log").info("Requested value is out of limits")
         return False
 
     # def start_move_wavelength(self, value, wait=True):
-    #     logging.getLogger("HWR").info("Moving wavelength to (%s)" % value)
+    #     self.log.info("Moving wavelength to (%s)" % value)
     #     return self.startMoveEnergy(12.3984 / value, wait)
 
     def cancelMoveEnergy(self):

mxcubecore/HardwareObjects/ExporterMotor.py

@@ -35,7 +35,6 @@ differ from the default ones.
   <use_global_state>False</use_global_state>
 """
 
-import logging
 import math
 import sys
 
@@ -194,7 +193,7 @@ class ExporterMotor(AbstractMotor):
         _val = self.motor_position_chan.get_value()
 
         if _val is None or math.isnan(_val):
-            logging.getLogger("HWR").debug("Value of %s is NaN" % self.actuator_name)
+            self.log.debug("Value of %s is NaN" % self.actuator_name)
             _val = self._nominal_value
 
         self._nominal_value = _val