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

mxcubecore/HardwareObjects/DESY/P11Collect.py

@@ -726,8 +726,8 @@ class P11Collect(AbstractCollect):
             image_filename (str): Filename of the image to be loaded.
             image_num (int, optional): Image number to load in ADXV. Defaults to 1.
         """
-        logging.getLogger("HWR").info(f"ADXV notify {image_filename}")
-        logging.getLogger("HWR").info(f"ADXV notify {image_num}")
+        self.log.info(f"ADXV notify {image_filename}")
+        self.log.info(f"ADXV notify {image_num}")
         adxv_host = "localhost"
         adxv_port = 8100
 
@@ -739,7 +739,7 @@ class P11Collect(AbstractCollect):
             )
             adxv_socket.close()
         except RuntimeWarning:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
         else:
             pass
 
@@ -1138,7 +1138,7 @@ class P11Collect(AbstractCollect):
                     except RuntimeError:
                         self.log.debug("mkdir failed:", str(sys.exc_info()))
 
-                        logging.getLogger("HWR").exception("")
+                        self.log.exception("")
                         return False
                 else:
                     self.log.debug("dir not found:", str(sys.exc_info()))
@@ -1220,7 +1220,7 @@ class P11Collect(AbstractCollect):
 
         auto_directory = xds_directory
 
-        logging.getLogger("HWR").info(
+        self.log.info(
             "[COLLECT] Processing input file directories: XDS: %s, AUTO: %s"
             % (xds_directory, auto_directory)
         )
@@ -1236,9 +1236,7 @@ class P11Collect(AbstractCollect):
                 try:
                     self.create_directories(snapshot_directory)
                 except Exception:
-                    logging.getLogger("HWR").exception(
-                        "Collection: Error creating snapshot directory"
-                    )
+                    self.log.exception("Collection: Error creating snapshot directory")
 
             number_of_snapshots = self.current_dc_parameters["take_snapshots"]
             logging.getLogger("user_level_log").info(

mxcubecore/HardwareObjects/DESY/P11EDNACharacterisation.py

@@ -246,29 +246,27 @@ class P11EDNACharacterisation(EDNACharacterisation):
         except AttributeError:
             import traceback
 
-            logging.getLogger("HWR").debug(
-                "EDNACharacterisation. transmission not saved "
-            )
-            logging.getLogger("HWR").debug(traceback.format_exc())
+            self.log.debug("EDNACharacterisation. transmission not saved ")
+            self.log.debug(traceback.format_exc())
 
         try:
             wavelength = HWR.beamline.energy.get_wavelength()
             beam.setWavelength(XSDataWavelength(wavelength))
         except AttributeError:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         try:
             # Flux get_value() subsequently executing measure_flux() to fill in the dictionary
 
             beam.setFlux(XSDataFlux(HWR.beamline.flux.get_value()))
         except AttributeError:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         try:
             min_exp_time = self.collect_obj.detector_hwobj.get_exposure_time_limits()[0]
             beam.setMinExposureTimePerImage(XSDataTime(min_exp_time))
         except AttributeError:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         try:
             beamsize = self.collect_obj.beam_info_hwobj.get_beam_size()
@@ -281,7 +279,7 @@ class P11EDNACharacterisation(EDNACharacterisation):
                     )
                 )
         except AttributeError:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         # Optimization parameters
         diff_plan = edna_input.getDiffractionPlan()
@@ -476,7 +474,7 @@ class P11EDNACharacterisation(EDNACharacterisation):
             collection_plan = edna_strategy.getCollectionPlan()[0]
             wedges = collection_plan.getCollectionStrategy().getSubWedge()
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
         else:
             try:
                 resolution = (
@@ -558,7 +556,7 @@ class P11EDNACharacterisation(EDNACharacterisation):
                         goniostat.getRotationAxisStart().getValue()
                     )
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
                 """ GB:
                 try:
                     acquisition_parameters.osc_end = (
@@ -574,7 +572,7 @@ class P11EDNACharacterisation(EDNACharacterisation):
                         goniostat.getOscillationWidth().getValue()
                     )
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
 
                 try:
                     num_images = int(
@@ -591,26 +589,26 @@ class P11EDNACharacterisation(EDNACharacterisation):
                     acq.path_template.start_num = 1
 
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
 
                 try:
                     acquisition_parameters.transmission = (
                         beam.getTransmission().getValue()
                     )
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
 
                 try:
                     acquisition_parameters.energy = round(
                         (123_984.0 / beam.getWavelength().getValue()) / 10000.0, 4
                     )
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
 
                 try:
                     acquisition_parameters.exp_time = beam.getExposureTime().getValue()
                 except AttributeError:
-                    logging.getLogger("HWR").exception("")
+                    self.log.exception("")
 
                 dc = qmo.DataCollection([acq], crystal, processing_parameters)
                 data_collections.append(dc)
@@ -652,6 +650,6 @@ class P11EDNACharacterisation(EDNACharacterisation):
             html_report = html_report.replace("/beamline/p11", "/gpfs")
 
         except AttributeError:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         return html_report

mxcubecore/HardwareObjects/DESY/P11ISPyBClient.py

@@ -48,13 +48,9 @@ class P11ISPyBClient(ProposalISPyBClient):
         else:
             self.simulated_prop_code = None
             self.simulated_prop_number = None
-        logging.getLogger("HWR").debug(
-            "PROPOSAL SIMULATED is %s" % self.simulated_proposal
-        )
-        logging.getLogger("HWR").debug("PROPOSAL CODE is %s" % self.simulated_prop_code)
-        logging.getLogger("HWR").debug(
-            "PROPOSAL NUMBER is %s" % self.simulated_prop_number
-        )
+        self.log.debug("PROPOSAL SIMULATED is %s" % self.simulated_proposal)
+        self.log.debug("PROPOSAL CODE is %s" % self.simulated_prop_code)
+        self.log.debug("PROPOSAL NUMBER is %s" % self.simulated_prop_number)
 
     def update_data_collection(self, mx_collection, wait=False):
         mx_collection["beamline_name"] = "P11"
@@ -106,7 +102,7 @@ class P11ISPyBClient(ProposalISPyBClient):
                 logging.debug("P11 ISPyBClient - %s is %s " % (prop, ispyb_path))
                 mx_collect_dict[prop] = ispyb_path
             except RuntimeWarning("Can not get ISPyB path for %s" % prop):
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
     def prepare_image_for_lims(self, image_dict):
         for prop in ["jpegThumbnailFileFullPath", "jpegFileFullPath"]:
@@ -115,10 +111,10 @@ class P11ISPyBClient(ProposalISPyBClient):
                 ispyb_path = HWR.beamline.session.path_to_ispyb(path)
                 image_dict[prop] = ispyb_path
             except RuntimeWarning("Can not prepare image path fir LIMS for %s" % prop):
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
     def get_proposal(self, proposal_code, proposal_number):
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "ISPyB. Obtaining proposal for code=%s / prop_number=%s"
             % (proposal_code, proposal_number)
         )

mxcubecore/HardwareObjects/DESY/P11NanoDiff.py

@@ -327,7 +327,7 @@ class P11NanoDiff(GenericDiffractometer):
             self.emit_centring_moving()
 
             try:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "Centring finished. Moving motors to position %s" % str(motor_pos)
                 )
                 self.move_to_motors_positions(motor_pos, wait=True)
@@ -339,9 +339,9 @@ class P11NanoDiff(GenericDiffractometer):
                 # centred positions include omega to initial position
                 pass
                 # if not self.in_plate_mode():
-                #    logging.getLogger("HWR").debug("Centring finished. Moving omega back to initial position")
+                #    self.log.debug("Centring finished. Moving omega back to initial position")
                 #    self.motor_hwobj_dict['phi'].set_value_relative(-180, timeout=None)
-                #    logging.getLogger("HWR").debug("         Moving omega done")
+                #    self.log.debug("         Moving omega done")
 
             if (
                 self.current_centring_method
@@ -429,7 +429,7 @@ class P11NanoDiff(GenericDiffractometer):
             vertical_discplacements.append(y)
             horizontal_displacements.append(x)
 
-            logging.getLogger("HWR").info("click %d %f %f %f" % (k + 1, omega, x, y))
+            self.log.info("click %d %f %f %f" % (k + 1, omega, x, y))
 
             dev_gonio = DeviceProxy("p11/servomotor/eh.1.01")
             if k <= n_clicks:
@@ -1474,7 +1474,7 @@ class P11NanoDiff(GenericDiffractometer):
                     "motor_positions is not a dict and cannot be converted using as_dict()"
                 )
 
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
                 return
 
         # Move translation motors

mxcubecore/HardwareObjects/DataPublisher.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 json
-import logging
 from enum import (
     Enum,
     unique,
@@ -164,10 +163,10 @@ class DataPublisher(HardwareObject):
                         )
                     else:
                         msg = "Unknown frame type %s" % message
-                        logging.getLogger("HWR").error(msg)
+                        self.log.error(msg)
                 except Exception:
                     msg = "Could not parse data in %s" % message
-                    logging.getLogger("HWR").exception(msg)
+                    self.log.exception(msg)
 
     def _remove_available(self, _id):
         """

mxcubecore/HardwareObjects/EDNACharacterisation.py

@@ -142,10 +142,8 @@ class EDNACharacterisation(AbstractCharacterisation):
         except AttributeError:
             import traceback
 
-            logging.getLogger("HWR").debug(
-                "EDNACharacterisation. transmission not saved "
-            )
-            logging.getLogger("HWR").debug(traceback.format_exc())
+            self.log.debug("EDNACharacterisation. transmission not saved ")
+            self.log.debug(traceback.format_exc())
 
         try:
             wavelength = HWR.beamline.energy.get_wavelength()

mxcubecore/HardwareObjects/EMBL/EMBLBeam.py

@@ -65,13 +65,13 @@ class EMBLBeam(AbstractBeam):
                 self.aperture_diameter_changed,
             )
         else:
-            logging.getLogger("HWR").debug("BeamInfo: Aperture hwobj not defined")
+            self.log.debug("BeamInfo: Aperture hwobj not defined")
 
         self._slits = self.get_object_by_role("slits")
         if self._slits is not None:
             self.connect(self._slits, "valueChanged", self.slits_gap_changed)
         else:
-            logging.getLogger("HWR").debug("BeamInfo: Slits hwobj not defined")
+            self.log.debug("BeamInfo: Slits hwobj not defined")
 
         self._definer = self.get_object_by_role("beam_focusing")
         if self._definer is not None:
@@ -85,7 +85,7 @@ class EMBLBeam(AbstractBeam):
                 self.focusing_mode_changed,
             )
         else:
-            logging.getLogger("HWR").debug("BeamInfo: Beam focusing hwobj not defined")
+            self.log.debug("BeamInfo: Beam focusing hwobj not defined")
 
         self.chan_beam_position_hor = self.get_channel_object("BeamPositionHorizontal")
         if self.chan_beam_position_hor:

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:
-            logging.getLogger("HWR").exception("")
+            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/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
@@ -378,7 +374,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
 
             logging.getLogger("GUI").error("Energy scan: Chooch failed")
 
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             return None, None, None, None, None, None, None, [], [], [], None
 
         rm = (pk + 30) / 1000.0
@@ -409,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",
@@ -459,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()
 
@@ -516,7 +512,7 @@ class EMBLEnergyScan(AbstractEnergyScan, HardwareObject):
                     }
                 )
         except IndexError:
-            logging.getLogger("HWR").exception("")
+            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:
-                logging.getLogger("HWR").exception("")
+                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()