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

mxcubecore/HardwareObjects/SOLEIL/SOLEILEnergyScan.py

@@ -15,7 +15,7 @@ from mxcubecore.TaskUtils import cleanup
 
 class SOLEILEnergyScan(HardwareObject):
     def init(self):
-        logging.getLogger("HWR").info(
+        self.log.info(
             "#############################    EnergyScan: INIT HWOBJ  ###################"
         )
         self.ready_event = gevent.event.Event()
@@ -48,7 +48,7 @@ class SOLEILEnergyScan(HardwareObject):
             try:
                 self.energyScanArgs = self.get_channel_object("escan_args")
             except KeyError:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: error initializing energy scan arguments (missing channel)"
                 )
                 self.energyScanArgs = None
@@ -57,7 +57,7 @@ class SOLEILEnergyScan(HardwareObject):
                 self.scanStatusMessage = self.get_channel_object("scanStatusMsg")
             except KeyError:
                 self.scanStatusMessage = None
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: energy messages will not appear (missing channel)"
                 )
             else:
@@ -83,7 +83,7 @@ class SOLEILEnergyScan(HardwareObject):
                     "commandNotReady", self.scanCommandNotReady
                 )
             except AttributeError as diag:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: error initializing energy scan (%s)" % str(diag)
                 )
                 self.do_energy_scan = Xanes  # .xanes(None, None) #None
@@ -95,26 +95,26 @@ class SOLEILEnergyScan(HardwareObject):
             self.lastResolution = None
 
             if HWR.beamline.lims is None:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: you should specify the database hardware object"
                 )
             self.scanInfo = None
 
             self.cryostreamHO = self.get_object_by_role("cryostream")
             if self.cryostreamHO is None:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: you should specify the cryo stream hardware object"
                 )
 
             self.machcurrentHO = self.get_object_by_role("machcurrent")
             if self.machcurrentHO is None:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: you should specify the machine current hardware object"
                 )
 
             self.fluodetectorHO = self.get_object_by_role("fluodetector")
             if self.fluodetectorHO is None:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: you should specify the fluorescence detector hardware object"
                 )
 
@@ -128,7 +128,7 @@ class SOLEILEnergyScan(HardwareObject):
                     "commandNotReady", self.moveEnergyCmdNotReady
                 )
             except AttributeError as diag:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: error initializing move energy (%s)" % str(diag)
                 )
                 self.moveEnergy = None
@@ -138,7 +138,7 @@ class SOLEILEnergyScan(HardwareObject):
                 HWR.beamline.energy.connect("stateChanged", self.energyStateChanged)
                 HWR.beamline.energy.connect("limitsChanged", self.energyLimitsChanged)
             if HWR.beamline.resolution is None:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "EnergyScan: no resolution motor (unable to restore it after moving the energy)"
                 )
             else:
@@ -152,7 +152,7 @@ class SOLEILEnergyScan(HardwareObject):
 
         if self.is_connected():
             self.sConnected()
-        logging.getLogger("HWR").info(
+        self.log.info(
             "#############################    EnergyScan: INIT HWOBJ IS FINISHED ###################"
         )
 
@@ -186,17 +186,17 @@ class SOLEILEnergyScan(HardwareObject):
         self.emit("disconnected", ())
 
     def setElement(self):
-        logging.getLogger("HWR").debug("EnergyScan: setElement")
+        self.log.debug("EnergyScan: setElement")
         self.emit("setElement", (self._element, self._edge))
 
     def newPoint(self, x, y):
-        logging.getLogger("HWR").debug("EnergyScan:newPoint")
+        self.log.debug("EnergyScan:newPoint")
         logging.info("EnergyScan newPoint %s, %s" % (x, y))
         self.emit("addNewPoint", (x, y))
         self.emit("newScanPoint", (x, y))
 
     def newScan(self, scanParameters):
-        logging.getLogger("HWR").debug("EnergyScan:newScan")
+        self.log.debug("EnergyScan:newScan")
         self.emit("newScan", (scanParameters,))
 
     # # Energy scan commands
@@ -212,7 +212,7 @@ class SOLEILEnergyScan(HardwareObject):
     ):
         self._element = element
         self._edge = edge
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "EnergyScan: starting energy scan %s, %s" % (self._element, self._edge)
         )
         self.setElement()
@@ -236,13 +236,11 @@ class SOLEILEnergyScan(HardwareObject):
         if self.fluodetectorHO is not None:
             self.scanInfo["fluorescenceDetector"] = self.fluodetectorHO.username
         if not os.path.isdir(directory):
-            logging.getLogger("HWR").debug(
-                "EnergyScan: creating directory %s" % directory
-            )
+            self.log.debug("EnergyScan: creating directory %s" % directory)
             try:
                 os.makedirs(directory)
             except OSError as diag:
-                logging.getLogger("HWR").error(
+                self.log.error(
                     "EnergyScan: error creating directory %s (%s)"
                     % (directory, str(diag))
                 )
@@ -258,7 +256,7 @@ class SOLEILEnergyScan(HardwareObject):
         # try:
         # curr=self.energyScanArgs.get_value()
         # except:
-        # logging.getLogger("HWR").exception('EnergyScan: error getting energy scan parameters')
+        # self.log.exception('EnergyScan: error getting energy scan parameters')
         # self.emit('scanStatusChanged', ("Error getting energy scan parameters",))
         # return False
         # try:
@@ -273,14 +271,12 @@ class SOLEILEnergyScan(HardwareObject):
 
         try:
             # self.energyScanArgs.set_value(curr)
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "EnergyScan: current energy scan parameters (%s, %s, %s, %s)"
                 % (element, edge, directory, prefix)
             )
         except Exception:
-            logging.getLogger("HWR").exception(
-                "EnergyScan: error setting energy scan parameters"
-            )
+            self.log.exception("EnergyScan: error setting energy scan parameters")
             self.emit("scanStatusChanged", ("Error setting energy scan parameters",))
             return False
         try:
@@ -291,7 +287,7 @@ class SOLEILEnergyScan(HardwareObject):
         except Exception:
             import traceback
 
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "EnergyScan: problem calling sequence %s" % traceback.format_exc()
             )
             self.emit("scanStatusChanged", ("Error problem spec macro",))
@@ -330,12 +326,10 @@ class SOLEILEnergyScan(HardwareObject):
         self.ready_event.set()
 
     def scanCommandFinished(self, result, *args):
-        logging.getLogger("HWR").debug("EnergyScan: energy scan result is %s" % result)
+        self.log.debug("EnergyScan: energy scan result is %s" % result)
         with cleanup(self.ready_event.set):
             self.scanInfo["endTime"] = time.strftime("%Y-%m-%d %H:%M:%S")
-            logging.getLogger("HWR").debug(
-                "EnergyScan: energy scan result is %s" % result
-            )
+            self.log.debug("EnergyScan: energy scan result is %s" % result)
             self.scanning = False
             if result == -1:
                 self.storeEnergyScan()
@@ -413,7 +407,7 @@ class SOLEILEnergyScan(HardwareObject):
         # f=open(rawScanFile, "w")
         # pyarch_f=open(archiveRawScanFile, "w")
         # except:
-        # logging.getLogger("HWR").exception("could not create raw scan files")
+        # self.log.exception("could not create raw scan files")
         # self.storeEnergyScan()
         # self.emit("energyScanFailed", ())
         # return
@@ -462,14 +456,14 @@ class SOLEILEnergyScan(HardwareObject):
         comm = ""
 
         self.thEdge = self.xanes.e_edge
-        logging.getLogger("HWR").info(
+        self.log.info(
             "th. Edge %s ; chooch results are pk=%f, ip=%f, rm=%f"
             % (self.thEdge, pk, ip, rm)
         )
         logging.info("math.fabs(self.thEdge - ip) %s" % math.fabs(self.thEdge - ip))
         logging.info("self.thEdgeThreshold %s" % self.thEdgeThreshold)
 
-        logging.getLogger("HWR").warning(
+        self.log.warning(
             "EnergyScan: calculated peak (%f) is more that 20eV %s the theoretical value (%f). Please check your scan and choose the energies manually"
             % (
                 savpk,
@@ -488,7 +482,7 @@ class SOLEILEnergyScan(HardwareObject):
                 % (savpk, self.thEdge)
             )
 
-            logging.getLogger("HWR").warning(
+            self.log.warning(
                 "EnergyScan: calculated peak (%f) is more that 20eV %s the theoretical value (%f). Please check your scan and choose the energies manually"
                 % (
                     savpk,
@@ -563,7 +557,7 @@ class SOLEILEnergyScan(HardwareObject):
         for i in range(len(chooch_graph_x)):
             chooch_graph_x[i] = chooch_graph_x[i] / 1000.0
 
-        logging.getLogger("HWR").info("<chooch> Saving png")
+        self.log.info("<chooch> Saving png")
         # prepare to save png files
         title = "%10s  %6s  %6s\n%10s  %6.2f  %6.2f\n%10s  %6.2f  %6.2f" % (
             "energy",
@@ -596,25 +590,25 @@ class SOLEILEnergyScan(HardwareObject):
         escan_archivepng = os.path.extsep.join((scanArchiveFilePrefix, "png"))
         self.scanInfo["jpegChoochFileFullPath"] = str(escan_archivepng)
         try:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Rendering energy scan and Chooch graphs to PNG file : %s", escan_png
             )
             canvas.print_figure(escan_png, dpi=80)
         except Exception:
-            logging.getLogger("HWR").exception("could not print figure")
+            self.log.exception("could not print figure")
         try:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Saving energy scan to archive directory for ISPyB : %s",
                 escan_archivepng,
             )
             canvas.print_figure(escan_archivepng, dpi=80)
         except Exception:
-            logging.getLogger("HWR").exception("could not save figure")
+            self.log.exception("could not save figure")
 
         self.storeEnergyScan()
         self.scanInfo = None
 
-        logging.getLogger("HWR").info("<chooch> returning")
+        self.log.info("<chooch> returning")
         self.emit(
             "chooch_finished",
             (
@@ -686,7 +680,7 @@ class SOLEILEnergyScan(HardwareObject):
             try:
                 return HWR.beamline.energy.get_value()
             except Exception:
-                logging.getLogger("HWR").exception("EnergyScan: couldn't read energy")
+                self.log.exception("EnergyScan: couldn't read energy")
                 return None
         elif (
             self.energy2WavelengthConstant is not None
@@ -711,7 +705,7 @@ class SOLEILEnergyScan(HardwareObject):
             try:
                 return self.energy2wavelength(HWR.beamline.energy.get_value())
             except Exception:
-                logging.getLogger("HWR").exception("EnergyScan: couldn't read energy")
+                self.log.exception("EnergyScan: couldn't read energy")
                 return None
         else:
             return self.defaultWavelength
@@ -724,41 +718,37 @@ class SOLEILEnergyScan(HardwareObject):
         return limits
 
     def startMoveEnergy(self, value, wait=True):
-        logging.getLogger("HWR").info("Moving energy to (%s)" % value)
+        self.log.info("Moving energy to (%s)" % value)
         try:
             value = float(value)
         except (TypeError, ValueError) as diag:
-            logging.getLogger("HWR").error("EnergyScan: invalid energy (%s)" % value)
+            self.log.error("EnergyScan: invalid energy (%s)" % value)
             return False
 
         try:
             curr_energy = HWR.beamline.energy.get_value()
         except Exception:
-            logging.getLogger("HWR").exception(
-                "EnergyScan: couldn't get current energy"
-            )
+            self.log.exception("EnergyScan: couldn't get current energy")
             curr_energy = None
 
         if value != curr_energy:
-            logging.getLogger("HWR").info("Moving energy: checking limits")
+            self.log.info("Moving energy: checking limits")
             try:
                 lims = HWR.beamline.energy.get_limits()
             except Exception:
-                logging.getLogger("HWR").exception(
-                    "EnergyScan: couldn't get energy limits"
-                )
+                self.log.exception("EnergyScan: couldn't get energy limits")
                 in_limits = False
             else:
                 in_limits = value >= lims[0] and value <= lims[1]
 
             if in_limits:
-                logging.getLogger("HWR").info("Moving energy: limits ok")
+                self.log.info("Moving energy: limits ok")
                 self.previousResolution = None
                 if HWR.beamline.resolution is not None:
                     try:
                         self.previousResolution = HWR.beamline.resolution.get_value()
                     except Exception:
-                        logging.getLogger("HWR").exception(
+                        self.log.exception(
                             "EnergyScan: couldn't get current resolution"
                         )
                 self.moveEnergyCmdStarted()
@@ -776,7 +766,7 @@ class SOLEILEnergyScan(HardwareObject):
                 else:
                     gevent.spawn(change_egy)
             else:
-                logging.getLogger("HWR").error(
+                self.log.error(
                     "EnergyScan: energy (%f) out of limits (%s)" % (value, lims)
                 )
                 return False
@@ -788,9 +778,7 @@ class SOLEILEnergyScan(HardwareObject):
     def set_wavelength(self, value, wait=True):
         energy_val = self.energy2wavelength(value)
         if energy_val is None:
-            logging.getLogger("HWR").error(
-                "EnergyScan: unable to convert wavelength to energy"
-            )
+            self.log.error("EnergyScan: unable to convert wavelength to energy")
             return False
         return self.startMoveEnergy(energy_val, wait)
 

mxcubecore/HardwareObjects/SOLEIL/SOLEILGuillotine.py

@@ -125,7 +125,7 @@ class SOLEILGuillotine(BaseHardwareObjects.HardwareObject):
                 "tangoname_pss"
             )  # PyTango.DeviceProxy('I11-MA-CE/PSS/DB_DATA')
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Guillotine I11-MA-CE/PSS/DB_DATA: tangopssDevice is not defined "
             )
 
@@ -133,7 +133,7 @@ class SOLEILGuillotine(BaseHardwareObjects.HardwareObject):
             self.memIntChan = self.get_channel_object("memInt")
             self.connect(self.memIntChan, "update", self.updateGuillotine)
         else:
-            logging.getLogger("HWR").error("Guillotine: tangopssDevice is not defined ")
+            self.log.error("Guillotine: tangopssDevice is not defined ")
 
     def shutterStateChanged(self, value):
         #

mxcubecore/HardwareObjects/SOLEIL/SOLEILISPyBClient.py

@@ -45,7 +45,7 @@ class SOLEILISPyBClient(ISPyBClient):
             hdlr.setFormatter(formatter)
             logger.addHandler(hdlr)
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         logger.setLevel(logging.INFO)
 
@@ -58,7 +58,7 @@ class SOLEILISPyBClient(ISPyBClient):
             # Initialize ldap
             self.ldapConnection = self.get_object_by_role("ldapServer")
             if self.ldapConnection is None:
-                logging.getLogger("HWR").debug("LDAP Server is not available")
+                self.log.debug("LDAP Server is not available")
 
         self.loginType = self.get_property("loginType") or "proposal"
         self.loginTranslate = self.get_property("loginTranslate") or True
@@ -100,7 +100,7 @@ class SOLEILISPyBClient(ISPyBClient):
                     return
         except Exception:
             print(traceback.print_exc())
-            logging.getLogger("HWR").exception(_CONNECTION_ERROR_MSG)
+            self.log.exception(_CONNECTION_ERROR_MSG)
             return
         try:
             proposals = HWR.beamline.session["proposals"]
@@ -111,19 +111,19 @@ class SOLEILISPyBClient(ISPyBClient):
                 try:
                     self._translations[code]["ldap"] = proposal.ldap
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
                 try:
                     self._translations[code]["ispyb"] = proposal.ispyb
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
                 try:
                     self._translations[code]["gui"] = proposal.gui
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
         except IndexError:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
     def translate(self, code, what):
         """
@@ -187,7 +187,7 @@ class SOLEILISPyBClient(ISPyBClient):
                 logging.debug("SOLEIL ISPyBClient - %s is %s " % (prop, ispyb_path))
                 mx_collect_dict[prop] = ispyb_path
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
     def prepare_image_for_lims(self, image_dict):
         for prop in ["jpegThumbnailFileFullPath", "jpegFileFullPath"]:
@@ -196,7 +196,7 @@ class SOLEILISPyBClient(ISPyBClient):
                 ispyb_path = HWR.beamline.session.path_to_ispyb(path)
                 image_dict[prop] = ispyb_path
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
 
 def test_hwo(hwo):

mxcubecore/HardwareObjects/SOLEIL/SOLEILMachineInfo.py

@@ -195,7 +195,7 @@ class SOLEILMachineInfo(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_sample_temperature = self.get_channel_object("sampleTemp")
         if self.chan_sample_temperature is not None:
@@ -240,7 +240,7 @@ class SOLEILMachineInfo(HardwareObject):
 
     def cryojet_in_changed(self, value):
         """Cryojet in/out value changed"""
-        logging.getLogger("HWR").debug("cryojet_in_changed: %s" % value)
+        self.log.debug("cryojet_in_changed: %s" % value)
         self.values_list[4]["in_range"] = False
         self.values_list[4]["bold"] = True
 
@@ -259,9 +259,7 @@ class SOLEILMachineInfo(HardwareObject):
                 % self.chan_sample_temperature.get_value()
             )
         else:
-            logging.getLogger("HWR").debug(
-                "chan_sample_temperature: %s" % self.chan_sample_temperature
-            )
+            self.log.debug("chan_sample_temperature: %s" % self.chan_sample_temperature)
         self.re_emit_values()
 
     def mach_current_changed(self, value):
@@ -363,9 +361,7 @@ class SOLEILMachineInfo(HardwareObject):
             self.values_list[5]["value"] = "Dewar level in range"
             self.values_list[5]["in_range"] = True
 
-        logging.getLogger("HWR").error(
-            "chan_sc_auto_refill %s" % self.chan_sc_auto_refill.get_value()
-        )
+        self.log.error("chan_sc_auto_refill %s" % self.chan_sc_auto_refill.get_value())
         if self.chan_sc_auto_refill.get_value() == 0:
             self.values_list[5]["value"] += ", refill OFF"
         else:

mxcubecore/HardwareObjects/SOLEIL/SOLEILPss.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import logging
 
 from PyTango import DeviceProxy
 
@@ -25,12 +24,12 @@ class SOLEILPss(HardwareObject):
         try:
             self.device = DeviceProxy(self.get_property("tangoname"))
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "%s: unknown pss device name", self.get_property("tangoname")
             )
 
         if self.get_property("hutch") not in ("optical", "experimental"):
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "SOLEILPss.init Hutch property %s is not correct",
                 self.get_property("hutch"),
             )
@@ -48,6 +47,6 @@ class SOLEILPss(HardwareObject):
         return self.get_state(self.stateChan.get_value())
 
     def value_changed(self, value):
-        logging.getLogger("HWR").info("%s: SOLEILPss.valueChanged, %s", self.id, value)
+        self.log.info("%s: SOLEILPss.valueChanged, %s", self.id, value)
         state = self.get_state(value)
         self.emit("wagoStateChanged", (state,))

mxcubecore/HardwareObjects/SOLEIL/SOLEILRuche.py

@@ -27,7 +27,7 @@ class SOLEILRuche(HardwareObject):
             if HWR.beamline.session.user_id is None:
                 return
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
         if os.path.isdir(path):
             path_to_sync = path
         elif os.path.exists(path):

mxcubecore/HardwareObjects/SOLEIL/TangoDCMotor.py

@@ -60,7 +60,7 @@ class TangoDCMotor(HardwareObject):
             try:
                 self.threshold = float(threshold)
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
         self.set_is_ready(True)
         try:
@@ -81,13 +81,11 @@ class TangoDCMotor(HardwareObject):
         self.positionValue = value
         if abs(float(value) - self.old_value) > self.threshold:
             try:
-                # logging.getLogger("HWR").error("%s: TangoDCMotor new position  , %s", self.name(), value)
+                # self.log.error("%s: TangoDCMotor new position  , %s", self.name(), value)
                 self.emit("valueChanged", (value,))
                 self.old_value = value
             except Exception:
-                logging.getLogger("HWR").error(
-                    "%s: TangoDCMotor not responding, %s", self.id, ""
-                )
+                self.log.error("%s: TangoDCMotor not responding, %s", self.id, "")
                 self.old_value = value
 
     def is_ready(self):
@@ -116,14 +114,14 @@ class TangoDCMotor(HardwareObject):
 
     def get_limits(self):
         try:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "TangoDCMotor.get_limits: trying to get limits for motor_name %s "
                 % (self.motor_name)
             )
             limits = self.ho.getMotorLimits(
                 self.motor_name
             )  # limitsCommand() # self.ho.getMotorLimits(self.motor_name)
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "TangoDCMotor.get_limits: Getting limits for %s -- %s "
                 % (self.motor_name, str(limits))
             )
@@ -131,7 +129,7 @@ class TangoDCMotor(HardwareObject):
                 limits = numpy.array([-10000, 10000])
         except Exception:
             # import traceback
-            # logging.getLogger("HWR").info("TangoDCMotor.get_limits: Cannot get limits for %s.\nException %s " % (self.motor_name, traceback.print_exc()))
+            # 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",
@@ -149,12 +147,10 @@ class TangoDCMotor(HardwareObject):
         if limits is None:
             try:
                 limits = self.get_property("min"), self.get_property("max")
-                logging.getLogger("HWR").info(
-                    "TangoDCMotor.get_limits: %.4f ***** %.4f" % limits
-                )
+                self.log.info("TangoDCMotor.get_limits: %.4f ***** %.4f" % limits)
                 limits = numpy.array(limits)
             except Exception:
-                # logging.getLogger("HWR").info("TangoDCMotor.get_limits: Cannot get limits for %s" % self.name())
+                # self.log.info("TangoDCMotor.get_limits: Cannot get limits for %s" % self.name())
                 limits = None
         return limits
 
@@ -210,9 +206,7 @@ class TangoDCMotor(HardwareObject):
                 type(value),
             )
         logging.info("TangoDCMotor: move. motor will go to %s " % str(value))
-        logging.getLogger("HWR").info(
-            "TangoDCMotor.move to absolute position: %.3f" % value
-        )
+        self.log.info("TangoDCMotor.move to absolute position: %.3f" % value)
         logging.getLogger("TangoClient").info(
             "TangoDCMotor move. Trying to go to %s: that is a '%s'",
             value,
@@ -232,7 +226,7 @@ class TangoDCMotor(HardwareObject):
         #     logging.info("TangoDCMotor: value %s " % str(value))
 
     def stop(self):
-        logging.getLogger("HWR").info("TangoDCMotor.stop")
+        self.log.info("TangoDCMotor.stop")
         stopcmd = self.get_command_object("Stop")()
         if not stopcmd:
             stopcmd = TangoCommand("stopcmd", "Stop", self.tangoname)

mxcubecore/HardwareObjects/SardanaMotor.py

@@ -1,5 +1,4 @@
 import enum
-import logging
 import time
 
 from gevent import Timeout
@@ -72,27 +71,27 @@ class SardanaMotor(AbstractMotor):
 
         self.actuator_name = self.get_property("actuator_name")
         if not self.name:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Undefined property actuator_name in xml. Applying name during instance creation."
             )
             self.actuator_name = self.name
 
         self.threshold = self.get_property("threshold", self.threshold_default)
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "Motor {0} threshold = {1}".format(self.actuator_name, self.threshold)
         )
 
         self.move_threshold = self.get_property(
             "move_threshold", self.move_threshold_default
         )
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "Motor {0} move_threshold = {1}".format(
                 self.actuator_name, self.move_threshold
             )
         )
 
         self.polling = self.get_property("interval", self.polling_default)
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "Motor {0} polling = {1}".format(self.actuator_name, self.polling)
         )
 

mxcubecore/HardwareObjects/Session.py

@@ -5,7 +5,6 @@ Contains information regarding the current session and methods to
 access and manipulate this information.
 """
 
-import logging
 import os
 import socket
 import time
@@ -94,7 +93,7 @@ class Session(HardwareObject):
                 domain = socket.getfqdn().split(".")
                 self.email_extension = ".".join((domain[-2], domain[-1]))
             except (TypeError, IndexError):
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
         self.set_base_data_directories(
             file_info["base_directory"],