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

mxcubecore/HardwareObjects/EMBL/EMBLBeamCentering.py

@@ -101,9 +101,7 @@ class EMBLBeamCentering(HardwareObject):
                 self.focusing_mode_changed,
             )
         else:
-            logging.getLogger("HWR").debug(
-                "BeamlineTest: Beam focusing hwobj is not defined"
-            )
+            self.log.debug("BeamlineTest: Beam focusing hwobj is not defined")
 
     def focusing_mode_changed(self, focusing_mode, beam_size):
         """Reemits focusing changed signal
@@ -128,7 +126,7 @@ class EMBLBeamCentering(HardwareObject):
         with gevent.Timeout(20, Exception("Timeout waiting for pitch scan ready")):
             while self.scan_status != 0:  # chan_pitch_scan_status.get_value() != 0:
                 gevent.sleep(0.1)
-                logging.getLogger("HWR").error("scan status %s" % self.scan_status)
+                self.log.error("scan status %s" % self.scan_status)
         self.cmd_set_vmax_pitch(1)
         sleep(3)
 

mxcubecore/HardwareObjects/EMBL/EMBLBeamFocusing.py

@@ -88,7 +88,7 @@ class EMBLBeamFocusing(HardwareObject):
                 )
                 motors_group.re_emit_values()
         else:
-            logging.getLogger("HWR").debug("BeamFocusing: No motors defined")
+            self.log.debug("BeamFocusing: No motors defined")
             self.active_focus_mode = self.focus_modes[0]["modeName"]
             self.size = self.focus_modes[0]["size"]
         self.re_emit_values()
@@ -96,7 +96,7 @@ class EMBLBeamFocusing(HardwareObject):
         try:
             self.cmd_set_phase = eval(self.get_property("setPhaseCmd"))
         except Exception:
-            pass
+            self.log.exception("")
 
         self.aperture_hwobj = self.get_object_by_role("aperture")
 
@@ -240,7 +240,7 @@ class EMBLBeamFocusing(HardwareObject):
         :type focus_mode: str
         """
         gevent.spawn(self.focus_mode_task, focus_mode)
-        logging.getLogger("HWR").info("Focusing: %s mode requested" % focus_mode)
+        self.log.info("Focusing: %s mode requested" % focus_mode)
         self.emit("focusingModeRequested", focus_mode)
 
     def focus_mode_task(self, focus_mode):

mxcubecore/HardwareObjects/EMBL/EMBLBeamlineTest.py

@@ -116,6 +116,8 @@ class EMBLBeamlineTest(HardwareObject):
                 logging.getLogger("HWR").warning(
                     "BeamlineTest: Unable to create test directories"
                 )
+
+                logging.getLogger("HWR").exception("")
                 return
 
         self.results_list = []

mxcubecore/HardwareObjects/EMBL/EMBLDoorInterlock.py

@@ -188,7 +188,7 @@ class EMBLDoorInterlock(HardwareObject):
                 )
                 logging.getLogger("GUI").error(msg)
         else:
-            logging.getLogger("HWR").info("Door is Interlocked")
+            self.log.info("Door is Interlocked")
 
     def re_emit_values(self):
         """Updates state"""

mxcubecore/HardwareObjects/EMBL/EMBLEnergy.py

@@ -104,7 +104,7 @@ class EMBLEnergy(AbstractEnergy):
         try:
             self._default_energy = self.get_property("defaultEnergy")
         except Exception:
-            logging.getLogger("HWR").warning("Energy: no default energy defined")
+            self.log.warning("Energy: no default energy defined")
 
         try:
             self._energy_limits = eval(self.get_property("staticLimits"))
@@ -135,9 +135,7 @@ class EMBLEnergy(AbstractEnergy):
                 value = self.chan_energy.get_value()
                 return value[0] / 1000
             except Exception:
-                logging.getLogger("HWR").exception(
-                    "Energy: could not read current energy"
-                )
+                self.log.exception("Energy: could not read current energy")
                 return None
         return value
 
@@ -153,9 +151,7 @@ class EMBLEnergy(AbstractEnergy):
                     self.chan_limit_high.get_value(),
                 )
             except Exception:
-                logging.getLogger("HWR").exception(
-                    "Energy: could not read energy limits"
-                )
+                self.log.exception("Energy: could not read energy limits")
         return self._energy_limits
 
     def get_wavelength_limits(self):
@@ -205,11 +201,11 @@ class EMBLEnergy(AbstractEnergy):
         """
         Checks given value if it is within limits
         """
-        logging.getLogger("HWR").info("Checking the move limits")
+        self.log.info("Checking the move limits")
         result = False
 
         if self._energy_limits[0] <= value <= self.en_lims[1]:
-            logging.getLogger("HWR").info("Limits ok")
+            self.log.info("Limits ok")
             result = True
         else:
             logging.getLogger("GUI").info("Energy: Requested value is out of limits")
@@ -223,7 +219,7 @@ class EMBLEnergy(AbstractEnergy):
     #     :param wait: boolean
     #     :return:
     #     """
-    #     logging.getLogger("HWR").info("Moving wavelength to (%s)" % value)
+    #     self.log.info("Moving wavelength to (%s)" % value)
     #     return self.move_energy(12.3984 / value, wait)
     #     # return self.startMoveEnergy(value, wait)
 
@@ -313,7 +309,7 @@ class EMBLEnergy(AbstractEnergy):
                 self._moving = False
                 self.set_break_bragg()
                 if self.cmd_reset_perp is not None:
-                    logging.getLogger("HWR").info("Energy: Perp reset sent")
+                    self.log.info("Energy: Perp reset sent")
                     self.cmd_reset_perp()
             self.move_energy_finished(0)
             self.update_state(self.STATES.READY)
@@ -402,22 +398,18 @@ class EMBLEnergy(AbstractEnergy):
             self.wait_ready()
             gevent.sleep(1)
             self.wait_ready()
-            logging.getLogger("HWR").info("Energy: Set bragg break cmd send")
+            self.log.info("Energy: Set bragg break cmd send")
             self.cmd_set_break_bragg(1)
             gevent.sleep(2)
             if self.chan_status_bragg_break is not None:
-                logging.getLogger("HWR").warning(
-                    "Energy: Waiting for break set (first try) ..."
-                )
+                self.log.warning("Energy: Waiting for break set (first try) ...")
                 with gevent.Timeout(
                     20, Exception("Energy: Timeout waiting for break set")
                 ):
                     while self.chan_status_bragg_break.get_value() != 0:
                         gevent.sleep(0.1)
                 gevent.sleep(3)
-                logging.getLogger("HWR").warning(
-                    "Waiting for break set (second try) ..."
-                )
+                self.log.warning("Waiting for break set (second try) ...")
                 with gevent.Timeout(20, Exception("Timeout waiting for break set")):
                     while self.chan_status_bragg_break.get_value() != 0:
                         gevent.sleep(0.1)

mxcubecore/HardwareObjects/EMBL/EMBLEnergyScan.py

@@ -181,7 +181,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
         :type exptime: float
         :return: True if success, otherwise returns False
         """
-        log = logging.getLogger("HWR")
+        log = self.log
 
         self.scan_info = {
             "sessionId": session_id,
@@ -304,7 +304,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
     def scanCommandFinished(self, *args):
         with TaskUtils.cleanup(self.ready_event.set):
             self.scan_info["endTime"] = time.strftime("%Y-%m-%d %H:%M:%S")
-            logging.getLogger("HWR").debug("Energy scan: finished")
+            self.log.debug("Energy scan: finished")
             self.scanning = False
             self.scan_info["startEnergy"] = self.scan_data[-1][0]
             self.scan_info["endEnergy"] = self.scan_data[-1][1]
@@ -330,9 +330,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
             if not os.path.exists(archive_directory):
                 os.makedirs(archive_directory)
         except Exception:
-            logging.getLogger("HWR").exception(
-                "EMBLEnergyScan: could not create results directory."
-            )
+            self.log.exception("EMBLEnergyScan: could not create results directory.")
             self.store_energy_scan()
             self.emit("energyScanFailed", ())
             return
@@ -340,9 +338,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
         try:
             archive_file_raw = open(archive_file_raw_filename, "w")
         except Exception:
-            logging.getLogger("HWR").exception(
-                "EMBLEnergyScan: could not create results raw file"
-            )
+            self.log.exception("EMBLEnergyScan: could not create results raw file")
             self.store_energy_scan()
             self.emit("energyScanFailed", ())
             return
@@ -377,6 +373,8 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
             self.store_energy_scan()
 
             logging.getLogger("GUI").error("Energy scan: Chooch failed")
+
+            self.log.exception("")
             return None, None, None, None, None, None, None, [], [], [], None
 
         rm = (pk + 30) / 1000.0
@@ -407,7 +405,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
         for i in range(len(chooch_graph_x)):
             chooch_graph_x[i] = chooch_graph_x[i] / 1000.0
 
-        # logging.getLogger("HWR").info("EMBLEnergyScan: Saving png" )
+        # self.log.info("EMBLEnergyScan: Saving png" )
         # prepare to save png files
         title = "%s  %s  %s\n%.4f  %.2f  %.2f\n%.4f  %.2f  %.2f" % (
             "energy",
@@ -457,13 +455,13 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
 
         self.scan_info["jpegChoochFileFullPath"] = str(archive_file_png_filename)
         try:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Saving energy scan to archive directory for ISPyB : %s",
                 archive_file_png_filename,
             )
             canvas.print_figure(archive_file_png_filename, dpi=80)
         except Exception:
-            logging.getLogger("HWR").exception("could not save figure")
+            self.log.exception("could not save figure")
 
         self.store_energy_scan()
 
@@ -514,7 +512,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
                     }
                 )
         except IndexError:
-            pass
+            self.log.exception("")
         return elements
 
     def get_scan_data(self):

mxcubecore/HardwareObjects/EMBL/EMBLFlux.py

@@ -170,7 +170,7 @@ class EMBLFlux(AbstractFlux):
                 self.intensity_ranges, key=lambda item: item["max"]
             )
         except Exception:
-            logging.getLogger("HWR").error("BeamlineTest: No intensity ranges defined")
+            self.log.error("BeamlineTest: No intensity ranges defined")
         """
 
         self.chan_intens_mean = self.get_channel_object("intensMean")
@@ -364,23 +364,23 @@ class EMBLFlux(AbstractFlux):
         # Close the fast shutter
         # -----------------------------------------------------------------
         HWR.beamline.fast_shutter.close(wait=True)
-        logging.getLogger("HWR").debug("Measure flux: Fast shutter closed")
+        self.log.debug("Measure flux: Fast shutter closed")
         gevent.sleep(0.2)
         HWR.beamline.diffractometer.wait_ready(10)
 
         # Move back light in, check beamstop position
         # -----------------------------------------------------------------
-        logging.getLogger("HWR").info("Measure flux: Moving backlight out...")
+        self.log.info("Measure flux: Moving backlight out...")
         self.emit("progressStep", 1, "Moving backlight out")
         HWR.beamline.back_light.move_in()
-        logging.getLogger("HWR").debug("Measure flux: Backlight moved out")
+        self.log.debug("Measure flux: Backlight moved out")
 
         beamstop_position = HWR.beamline.beamstop.get_value()
         if beamstop_position == "BEAM":
             self.emit("progressStep", 2, "Moving beamstop OFF")
             HWR.beamline.beamstop.set_position("OFF")
             HWR.beamline.diffractometer.wait_ready(30)
-            logging.getLogger("HWR").info("Measure flux: Beamstop moved off")
+            self.log.info("Measure flux: Beamstop moved off")
 
         # Check scintillator position
         # -----------------------------------------------------------------
@@ -390,9 +390,7 @@ class EMBLFlux(AbstractFlux):
             HWR.beamline.diffractometer.set_scintillator_position("PHOTODIODE")
             gevent.sleep(1)
             HWR.beamline.diffractometer.wait_ready(30)
-            logging.getLogger("HWR").debug(
-                "Measure flux: Scintillator set to photodiode"
-            )
+            self.log.debug("Measure flux: Scintillator set to photodiode")
 
         self.measured_flux_list = []
 
@@ -417,7 +415,7 @@ class EMBLFlux(AbstractFlux):
 
                 gevent.sleep(1)
                 intens_value = self.chan_intens_mean.get_value(force=True)
-                logging.getLogger("HWR").info("Measured current: %s" % intens_value)
+                self.log.info("Measured current: %s" % intens_value)
                 # HWR.beamline.fast_shutter.closeShutter(wait=True)
                 intensity_value = intens_value[0] + 1.860e-5  # 2.780e-6
                 self.measured_flux_list.append(self.get_flux_result(intensity_value))
@@ -428,21 +426,21 @@ class EMBLFlux(AbstractFlux):
                 self.cmd_flux_record([_x["flux"] for _x in self.measured_flux_list])
                 gevent.sleep(2)
             except Exception:
-                pass
+                self.log.exception("")
 
             max_frame_rate = 25
         else:
             self.emit("progressStep", 5, "Measuring the intensity")
             current_aperture_index = 0
             HWR.beamline.fast_shutter.open(wait=True)
-            logging.getLogger("HWR").debug("Measure flux: Fast shutter opened")
+            self.log.debug("Measure flux: Fast shutter opened")
 
             gevent.sleep(0.5)
             intens_value = self.chan_intens_mean.get_value()
 
             intens_range_now = self.chan_intens_range.get_value()
             HWR.beamline.fast_shutter.close(wait=True)
-            logging.getLogger("HWR").debug("Measure flux: Fast shutter closed")
+            self.log.debug("Measure flux: Fast shutter closed")
 
             intensity_value = intens_value[0] + 2.780e-6
             self.measured_flux_list.append(self.get_flux_result(intensity_value))

mxcubecore/HardwareObjects/EMBL/EMBLMachineInfo.py

@@ -161,7 +161,7 @@ class EMBLMachineInfo(HardwareObject):
             self.cryojet_in_changed(self.chan_cryojet_in.get_value())
             self.chan_cryojet_in.connect_signal("update", self.cryojet_in_changed)
         else:
-            logging.getLogger("HWR").debug("MachineInfo: Cryojet channel not defined")
+            self.log.debug("MachineInfo: Cryojet channel not defined")
 
         self.chan_sc_dewar_low_level_alarm = self.get_channel_object(
             "scLowLevelAlarm", optional=True
@@ -524,7 +524,7 @@ class EMBLMachineInfo(HardwareObject):
                         last_value = line_el[-1]
             last_value = float(last_value)
         except Exception:
-            logging.getLogger("HWR").debug("MachineInfo: Unable to read epics values")
+            self.log.debug("MachineInfo: Unable to read epics values")
         finally:
             if url_file:
                 url_file.close()

mxcubecore/HardwareObjects/EMBL/EMBLMiniDiff.py

@@ -184,7 +184,7 @@ class EMBLMiniDiff(GenericDiffractometer):
         self.beam_position = value
 
     def state_changed(self, state):
-        # logging.getLogger("HWR").debug("State changed: %s" % str(state))
+        # self.log.debug("State changed: %s" % str(state))
         self.current_state = state
         self.emit("minidiffStateChanged", (self.current_state))
         self.emit("minidiffStatusChanged", (self.current_state))
@@ -308,7 +308,7 @@ class EMBLMiniDiff(GenericDiffractometer):
             in (GenericDiffractometer.PHASE_TRANSFER, GenericDiffractometer.PHASE_BEAM)
         ):
             detector_distance = HWR.beamline.detector.distance.get_value()
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "Diffractometer current phase: %s " % self.current_phase
                 + "selected phase: %s" % phase
                 + "detector distance: %d mm" % detector_distance
@@ -330,7 +330,7 @@ class EMBLMiniDiff(GenericDiffractometer):
             self.wait_device_ready(30)
             _howlong = time.time() - _start
             if _howlong > 11.0:
-                logging.getLogger("HWR").error(
+                self.log.error(
                     "Changing phase to %s took %.1f seconds" % (phase, _howlong)
                 )
         else:
@@ -375,7 +375,7 @@ class EMBLMiniDiff(GenericDiffractometer):
         if self.current_phase != "BeamLocation":
             GenericDiffractometer.move_to_beam(self, x, y, omega)
         else:
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "Diffractometer: Move to screen"
                 + " position disabled in BeamLocation phase."
             )
@@ -519,13 +519,17 @@ class EMBLMiniDiff(GenericDiffractometer):
                     self.motor_hwobj_dict["sampx"]: centred_position.sampx,
                     self.motor_hwobj_dict["sampy"]: centred_position.sampy,
                     self.motor_hwobj_dict["phi"]: centred_position.phi,
-                    self.motor_hwobj_dict["phiy"]: centred_position.phiy
-                    + self.centring_hwobj.camera2alignmentMotor(
-                        self.motor_hwobj_dict["phiy"], {"X": dx, "Y": dy}
+                    self.motor_hwobj_dict["phiy"]: (
+                        centred_position.phiy
+                        + self.centring_hwobj.camera2alignmentMotor(
+                            self.motor_hwobj_dict["phiy"], {"X": dx, "Y": dy}
+                        )
                     ),
-                    self.motor_hwobj_dict["phiz"]: centred_position.phiz
-                    + self.centring_hwobj.camera2alignmentMotor(
-                        self.motor_hwobj_dict["phiz"], {"X": dx, "Y": dy}
+                    self.motor_hwobj_dict["phiz"]: (
+                        centred_position.phiz
+                        + self.centring_hwobj.camera2alignmentMotor(
+                            self.motor_hwobj_dict["phiz"], {"X": dx, "Y": dy}
+                        )
                     ),
                     self.motor_hwobj_dict["kappa"]: centred_position.kappa,
                     self.motor_hwobj_dict["kappa_phi"]: centred_position.kappa_phi,
@@ -534,9 +538,7 @@ class EMBLMiniDiff(GenericDiffractometer):
             except BaseException:
                 logging.exception("Could not move to centred position")
         else:
-            logging.getLogger("HWR").debug(
-                "Move to centred position disabled in BeamLocation phase."
-            )
+            self.log.debug("Move to centred position disabled in BeamLocation phase.")
 
     def move_kappa_and_phi(self, kappa=None, kappa_phi=None, wait=False):
         return gevent.spawn(self.move_kappa_and_phi_procedure, kappa, kappa_phi)
@@ -600,9 +602,7 @@ class EMBLMiniDiff(GenericDiffractometer):
 
     def visual_align(self, point_1, point_2):
         if self.in_plate_mode():
-            logging.getLogger("HWR").info(
-                "EMBLMiniDiff: Visual align not available in Plate mode"
-            )
+            self.log.info("EMBLMiniDiff: Visual align not available in Plate mode")
         else:
             t1 = [point_1.sampx, point_1.sampy, point_1.phiy]
             t2 = [point_2.sampx, point_2.sampy, point_2.phiy]
@@ -656,12 +656,12 @@ class EMBLMiniDiff(GenericDiffractometer):
 
     def close_kappa_task(self):
         """Close kappa task"""
-        logging.getLogger("HWR").debug("Diffractometer: Closing Kappa started...")
+        self.log.debug("Diffractometer: Closing Kappa started...")
         self.move_kappa_and_phi_procedure(0, 270)
         self.wait_device_ready(180)
         self.motor_hwobj_dict["kappa"].home()
         self.wait_device_ready(60)
-        logging.getLogger("HWR").debug("Diffractometer: Done Closing Kappa")
+        self.log.debug("Diffractometer: Done Closing Kappa")
 
     def set_zoom(self, position):
         self.zoom_motor_hwobj.move_to_position(position)

mxcubecore/HardwareObjects/EMBL/EMBLMotorsGroup.py

@@ -75,7 +75,6 @@ Example Hardware Object XML file :
 </object>
 """
 
-import logging
 import time
 
 import gevent
@@ -147,7 +146,7 @@ class EMBLMotorsGroup(HardwareObject):
                 self.group_address,
                 self.positionAddr,
             )
-            logging.getLogger("HWR").error(msg)
+            self.log.error(msg)
 
         try:
             self.chan_status = self.add_channel(
@@ -166,7 +165,7 @@ class EMBLMotorsGroup(HardwareObject):
                 self.group_address,
                 self.statusAddr,
             )
-            logging.getLogger("HWR").error(msg)
+            self.log.error(msg)
 
     def get_motors_dict(self):
         """Returns dict with motors"""
@@ -188,16 +187,14 @@ class EMBLMotorsGroup(HardwareObject):
                     motor["setCmd"],
                     new_position,
                 )
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "EMBLMotorsGroup: send %s : %.4f"
                     % (motor["motorAddr"], new_position)
                 )
                 time.sleep(0.2)
                 self.wait_motor_ready(motor_name, timeout=10)
                 time.sleep(1)
-                logging.getLogger("HWR").debug(
-                    "EMBLMotorsGroup: motor %s ready" % motor["motorAddr"]
-                )
+                self.log.debug("EMBLMotorsGroup: motor %s ready" % motor["motorAddr"])
                 break
 
     def set_motor_focus_mode(self, motor_name, focus_mode):
@@ -248,14 +245,14 @@ class EMBLMotorsGroup(HardwareObject):
                     motor["setCmd"],
                     motor["focusingModes"][str(focus_mode)],
                 )
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "EMBLMotorsGroup: send %s : %.4f"
                     % (motor["motorAddr"], motor["focusingModes"][str(focus_mode)])
                 )
                 if motor["motorName"] in ("In", "Out", "Top", "But"):
                     self.wait_motor_ready(motor["motorName"], timeout=10)
                     time.sleep(1.1)
-                    logging.getLogger("HWR").debug(
+                    self.log.debug(
                         "EMBLMotorsGroup: motor %s ready" % motor["motorAddr"]
                     )
 

mxcubecore/HardwareObjects/EMBL/EMBLOnlineProcessing.py

@@ -436,13 +436,13 @@ class EMBLOnlineProcessing(AbstractOnlineProcessing):
 
             if len(batch) >= self.params_dict["images_num"]:
                 self.all_frames_batch_processed = True
-                logging.getLogger("HWR").info(
+                self.log.info(
                     "All dozor scores %s of %s"
                     % (len(batch), self.params_dict["images_num"])
                 )
                 self.finish_processing()
             else:
-                logging.getLogger("HWR").info(
+                self.log.info(
                     "Dozor scores %s of %s %s"
                     % (len(batch), self.params_dict["images_num"], self.batch_count)
                 )
@@ -485,20 +485,20 @@ class EMBLOnlineProcessing(AbstractOnlineProcessing):
 
             if len(is_values) >= self.params_dict["images_num"]:
                 self.all_frames_dozor_is = True
-                logging.getLogger("HWR").info(
+                self.log.info(
                     "All ISs %s of %s"
                     % (len(is_values), self.params_dict["images_num"])
                 )
                 self.finish_processing()
             else:
-                logging.getLogger("HWR").info(
+                self.log.info(
                     "IS values %s of %s %s"
                     % (len(is_values), self.params_dict["images_num"], self.is_count)
                 )
 
     def finish_processing(self):
         if self.all_frames_dozor_is and self.all_frames_batch_processed:
-            logging.getLogger("HWR").info("Processing finished")
+            self.log.info("Processing finished")
             self.set_processing_status("Success")
             self.all_frames_dozor_is = False
             self.all_frames_batch_processed = False
@@ -558,7 +558,7 @@ class EMBLOnlineProcessing(AbstractOnlineProcessing):
             )
             dozor_result.addImageDozor(dozor_image)
         dozor_result.exportToFile(processing_xml_filename)
-        logging.getLogger("HWR").info(
+        self.log.info(
             "Online processing: Results saved in %s" % processing_xml_filename
         )
 

mxcubecore/HardwareObjects/EMBL/EMBLPPUControl.py

@@ -132,7 +132,7 @@ class EMBLPPUControl(HardwareObject):
                         logging.getLogger("GUI").error(msg)
         else:
             msg = "PPUControl: %s" % self.all_status
-            logging.getLogger("HWR").debug(msg)
+            self.log.debug(msg)
 
         self.msg = (
             "Restart result:\n\n%s\n\n" % self.restart_result

mxcubecore/HardwareObjects/EMBL/EMBLSSXChip.py

@@ -17,7 +17,6 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with MXCuBE. If not, see <http://www.gnu.org/licenses/>.
 
-import logging
 
 from mxcubecore.HardwareObjects import QtGraphicsLib as GraphicsLib
 from mxcubecore.HardwareObjects.QtGraphicsManager import QtGraphicsManager
@@ -110,9 +109,7 @@ class EMBLSSXChip(QtGraphicsManager):
         if item_name in self.chip_config_list[self.current_chip_index]:
             self.chip_config_list[self.current_chip_index][item_name] = item_value
         else:
-            logging.getLogger("HWR").warning(
-                "Item %s not found in the config dict" % item_name
-            )
+            self.log.warning("Item %s not found in the config dict" % item_name)
 
     def get_dg_channels_list(self):
         return self.dg_channels_list

mxcubecore/HardwareObjects/EMBL/EMBLSlitBox.py

@@ -68,8 +68,6 @@ Example Hardware Object XML file :
 </object>
 """
 
-import logging
-
 from mxcubecore.HardwareObjects.abstract.AbstractSlits import AbstractSlits
 
 __credits__ = ["EMBL Hamburg"]
@@ -154,7 +152,7 @@ class EMBLSlitBox(AbstractSlits):
             )
             self.beam_focus_hwobj.re_emit_values()
         else:
-            logging.getLogger("HWR").debug("EMBLSlitBox: beamFocus HO not defined")
+            self.log.debug("EMBLSlitBox: beamFocus HO not defined")
 
     def get_step_sizes(self):
         """Returns Hor and Ver step sizes (list of two values)"""

mxcubecore/HardwareObjects/EMBL/EMBLTableMotor.py

@@ -20,7 +20,6 @@
 """EMBLTableMotor"""
 
 import atexit
-import logging
 import socket
 import time
 
@@ -112,6 +111,6 @@ class EMBLTableMotor(AbstractMotor):
         """
         try:
             self.socket.close()
-            logging.getLogger("HWR").info("EMBLTableMotor: Socket closed")
+            self.log.info("EMBLTableMotor: Socket closed")
         except Exception:
-            logging.getLogger("HWR").error("EMBLTableMotor: Failed to close the socket")
+            self.log.error("EMBLTableMotor: Failed to close the socket")

mxcubecore/HardwareObjects/EMBL/EMBLXRFSpectrum.py

@@ -86,20 +86,20 @@ class EMBLXRFSpectrum(AbstractXRFSpectrum):
         """Controls execution"""
         if self.spectrum_running:
             if status == "scaning":
-                logging.getLogger("HWR").info("XRF spectrum in progress...")
+                self.log.info("XRF spectrum in progress...")
             elif status == "ready":
                 if self.spectrum_running:
                     self.spectrum_data = list(self.cmd_spectrum_start.get())
                     # self.mca_calib = self.chan_spectrum_consts.get_value()[::-1]
                     self.spectrum_command_finished()
-                    logging.getLogger("HWR").info("XRF spectrum finished")
+                    self.log.info("XRF spectrum finished")
             elif status == "aborting":
                 if self.spectrum_running:
                     self.spectrum_command_aborted()
-                    logging.getLogger("HWR").info("XRF spectrum aborted!")
+                    self.log.info("XRF spectrum aborted!")
             elif status == "error":
                 self.spectrum_command_failed()
-                logging.getLogger("HWR").error("XRF spectrum failed!")
+                self.log.error("XRF spectrum failed!")
 
     def cancel_spectrum(self, *args):
         """Cancels acquisition"""

mxcubecore/HardwareObjects/EMBL/EMBLXrayImaging.py

@@ -905,7 +905,7 @@ class EMBLXrayImaging(QtGraphicsManager, AbstractCollect):
             if relative_angle:
                 if index >= abs(self.image_count / 360.0 * relative_angle):
                     break
-            logging.getLogger("HWR").debug("display: " + str(self.current_image_index))
+            self.log.debug("display: " + str(self.current_image_index))
             self.display_image(self.current_image_index)
             self.current_image_index += direction * step
             if self.repeat_image_play and self.current_image_index >= self.image_count: