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

mxcubecore/HardwareObjects/RedisClient.py

@@ -33,8 +33,6 @@ NBNB OBSOLETE there is no longer a beamline_setup
 </object>
 """
 
-import logging
-
 import gevent
 import jsonpickle
 import redis
@@ -75,12 +73,12 @@ class RedisClient(HardwareObject):
             self.active = False
 
         if self.active:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "RedisClient: listening to connections on %s:%d"
                 % (self.host, self.port)
             )
         else:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "RedisClient: Redis server %s:%d is not available"
                 % (self.host, self.port)
             )
@@ -88,7 +86,7 @@ class RedisClient(HardwareObject):
         try:
             self.connect(HWR.beamline.flux, "fluxChanged", self.flux_changed)
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         self.proposal_id = HWR.beamline.session.get_proposal()
         self.beamline_name = HWR.beamline.session.beamline_name
@@ -112,7 +110,7 @@ class RedisClient(HardwareObject):
             "mxcube:%s:%s:queue_current" % (self.proposal_id, self.beamline_name),
             queue_list,
         )
-        logging.getLogger("HWR").debug("RedisClient: Current queue saved")
+        self.log.debug("RedisClient: Current queue saved")
 
     def load_queue(self):
         """Loads queue from redis DB"""
@@ -134,13 +132,13 @@ class RedisClient(HardwareObject):
                 )
 
             self.active = True
-            logging.getLogger("HWR").debug("RedisClient: Queue loaded")
+            self.log.debug("RedisClient: Queue loaded")
             return selected_model
 
     def save_graphics(self):
         """Saves graphics objects in RedisDB"""
         if self.active:
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "RedisClient: Graphics saved at "
                 + "mxcube:%s:%s:graphics" % (self.proposal_id, self.beamline_name)
             )
@@ -160,9 +158,9 @@ class RedisClient(HardwareObject):
                 HWR.beamline.sample_view.load_shapes(
                     jsonpickle.decode(graphics_objects)
                 )
-                logging.getLogger("HWR").debug("RedisClient: Graphics loaded")
+                self.log.debug("RedisClient: Graphics loaded")
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
     def save_queue_history_item(self, item):
         """Saves queue history in redisDB"""
@@ -171,7 +169,7 @@ class RedisClient(HardwareObject):
                 "mxcube:%s:%s:queue_history" % (self.proposal_id, self.beamline_name),
                 str(item),
             )
-            logging.getLogger("HWR").debug("RedisClient: History queue saved")
+            self.log.debug("RedisClient: History queue saved")
 
     def load_queue_history(self):
         """Loads queue history from redisDB"""
@@ -187,7 +185,7 @@ class RedisClient(HardwareObject):
                 for item in items:
                     result.append(eval(item))
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
         return result
 
     def clear_db(self):
@@ -207,14 +205,12 @@ class RedisClient(HardwareObject):
 
             self.active = True
         except Exception as ex:
-            logging.getLogger("HWR").debug(
-                "Redis: Exception in reading beamline setup: %s" % str(ex)
-            )
+            self.log.debug("Redis: Exception in reading beamline setup: %s" % str(ex))
 
     def save_beamline_setup_item(self, key, value):
         if self.active:
             if key == "flux":
-                logging.getLogger("HWR").debug("RedisClient: Flux value saved")
+                self.log.debug("RedisClient: Flux value saved")
                 self.redis_client.set(
                     "mxcube:%s:%s:flux" % (self.proposal_id, self.beamline_name),
                     value[0],

mxcubecore/HardwareObjects/SC3.py

@@ -1,4 +1,3 @@
-import logging
 import xml.sax
 from xml.sax.handler import ContentHandler
 
@@ -375,7 +374,7 @@ class SC3(SampleChanger):
                         Pin.get_sample_address(basket_no, sample_no)
                     )
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
         self._set_selected_component(basket)
         self._set_selected_sample(sample)
 

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Attenuator.py

@@ -1,5 +1,3 @@
-import logging
-
 from mxcubecore.BaseHardwareObjects import HardwareObject
 
 
@@ -64,7 +62,7 @@ class PX1Attenuator(HardwareObject):
         try:
             value = self.get_value()
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "%s attFactorChanged : received value on channel is not a float value",
                 str(self.name()),
             )

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1BeamInfo.py

@@ -85,7 +85,7 @@ class PX1BeamInfo(HardwareObject):
                     self.beam_info_dict["size_x"] = self.beam_size[0] = float(beamx)
                     self.beam_info_dict["size_y"] = self.beam_size[1] = float(beamy)
             except Exception:
-                logging.getLogger("HWR").exception("")
+                self.log.exception("")
 
     def connect_notify(self, signal):
         if signal == "beamInfoChanged":

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1CatsMaint.py

@@ -1,4 +1,3 @@
-import logging
 import time
 
 from mxcubecore import HardwareRepository as HWR
@@ -47,18 +46,18 @@ class PX1CatsMaint(CatsMaint):
 
     def _do_home_open(self, unload=False):
         if unload and self.loaded:
-            logging.getLogger("HWR").debug("Unloading sample first")
+            self.log.debug("Unloading sample first")
             self.cats_hwo._do_unload()
             time.sleep(3)
             while HWR.beamline.sample_changer._is_device_busy():
                 time.sleep(0.3)
 
-        logging.getLogger("HWR").debug("Running the home command (home/open) now")
+        self.log.debug("Running the home command (home/open) now")
         self._cmdHome()
 
     def _do_dry_soak(self):
         self._cmdDrySoak()
 
     def _do_reset(self):
-        logging.getLogger("HWR").debug("PX1CatsMaint: executing the _do_reset function")
+        self.log.debug("PX1CatsMaint: executing the _do_reset function")
         self._cmdReset()

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Collect.py

@@ -112,7 +112,7 @@ class PX1Collect(AbstractCollect, HardwareObject):
 
         collection_type = self.current_dc_parameters["experiment_type"]
 
-        logging.getLogger("HWR").info(
+        self.log.info(
             "PX1Collect: Running PX1 data collection hook. Type is %s" % collection_type
         )
 
@@ -161,7 +161,7 @@ class PX1Collect(AbstractCollect, HardwareObject):
         fileinfo = self.current_dc_parameters["fileinfo"]
         basedir = fileinfo["directory"]
 
-        logging.getLogger("HWR").info("PX1Collect: fileinfo is %s " % str(fileinfo))
+        self.log.info("PX1Collect: fileinfo is %s " % str(fileinfo))
         imgname = fileinfo["template"] % osc_seq["start_image_number"]
 
         # move omega to start angle
@@ -171,7 +171,7 @@ class PX1Collect(AbstractCollect, HardwareObject):
         osc_range = osc_seq["range"]
         exp_time = osc_seq["exposure_time"]
 
-        logging.getLogger("HWR").info(
+        self.log.info(
             "PX1Collect:  nb_images: %s / osc_range: %s / exp_time: %s"
             % (nb_images, osc_range, exp_time)
         )
@@ -354,14 +354,14 @@ class PX1Collect(AbstractCollect, HardwareObject):
         #
         # data collection end (or abort)
         #
-        logging.getLogger("HWR").info("PX1Collect: finishing data collection ")
+        self.log.info("PX1Collect: finishing data collection ")
         HWR.beamline.diffractometer.omega.stop()
         HWR.beamline.fast_shutter.closeShutter()
 
         self.emit("progressStop")
 
     def data_collection_failed(self):
-        logging.getLogger("HWR").info(
+        self.log.info(
             "PX1Collect: Data collection failed. recovering sequence should go here"
         )
 
@@ -428,7 +428,7 @@ class PX1Collect(AbstractCollect, HardwareObject):
         time.sleep(0.3)  # allow time to refresh display after
 
         HWR.beamline.sample_view.save_snapshot(filename)
-        logging.getLogger("HWR").debug("PX1Collect:  - snapshot saved to %s" % filename)
+        self.log.debug("PX1Collect:  - snapshot saved to %s" % filename)
 
     def generate_thumbnails(self, filename, jpeg_filename, thumbnail_filename):
         #
@@ -489,10 +489,10 @@ class PX1Collect(AbstractCollect, HardwareObject):
         except Exception:
             import traceback
 
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "PX1Collect: Error changing permissions for PROCESS directory"
             )
-            logging.getLogger("HWR").error(traceback.format_exc())
+            self.log.error(traceback.format_exc())
 
         self.create_goimg_file(process_dir)
 
@@ -616,7 +616,7 @@ class PX1Collect(AbstractCollect, HardwareObject):
         if not self.is_collect_phase():
             success = self.go_to_collect()
             if not success:
-                logging.getLogger("HWR").info("PX1Collect: Cannot set COLLECT phase")
+                self.log.info("PX1Collect: Cannot set COLLECT phase")
                 return False
         return True
 
@@ -744,7 +744,7 @@ class PX1Collect(AbstractCollect, HardwareObject):
             if env_state != "RUNNING" and self.is_collect_phase():
                 break
             if time.time() - t0 > timeout:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "PX1Collect: timeout sending supervisor to collect phase"
                 )
                 break
@@ -766,7 +766,7 @@ class PX1Collect(AbstractCollect, HardwareObject):
             if env_state != "RUNNING" and self.is_sampleview_phase():
                 break
             if time.time() - t0 > timeout:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "PX1Collect: timeout sending supervisor to sample view phase"
                 )
                 break

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Cryotong.py

@@ -103,8 +103,8 @@ class PX1Cryotong(Cats90):
                 try:
                     self._cmdAckSampleMemory()
                 except Exception:
-                    """ do nothing if cmd not to acknowledge not in xml """
-                    logging.getLogger("HWR").exception("")
+                    """do nothing if cmd not to acknowledge not in xml"""
+                    self.log.exception("")
             self.incoherent_state = value
 
     def _dry_and_soak_needed(self, value=None):
@@ -125,9 +125,7 @@ class PX1Cryotong(Cats90):
             value = self._chnCountDown.get_value()
 
         if value != self.count_down:
-            logging.getLogger("HWR").info(
-                "PX1Cats. CountDown changed. Now is: %s" % value
-            )
+            self.log.info("PX1Cats. CountDown changed. Now is: %s" % value)
             self.count_down = value
             self.emit("countdownSignal", value)
 
@@ -254,9 +252,7 @@ class PX1Cryotong(Cats90):
         while not self._chnPowered.get_value():
             gevent.sleep(0.3)
             if time.time() - t0 > timeout:
-                logging.getLogger("HWR").warning(
-                    "CRYOTONG: timeout waiting for power on"
-                )
+                self.log.warning("CRYOTONG: timeout waiting for power on")
                 break
 
         if self._chnPowered.get_value():
@@ -275,9 +271,7 @@ class PX1Cryotong(Cats90):
         wait_n = 0
         while self._is_device_busy():
             if wait_n % 10 == 3:
-                logging.getLogger("HWR").warning(
-                    "CRYOTONG: waiting for dry and soak to complete"
-                )
+                self.log.warning("CRYOTONG: waiting for dry and soak to complete")
             gevent.sleep(0.3)
             wait_n += 1
 
@@ -300,18 +294,14 @@ class PX1Cryotong(Cats90):
         while not self.environment.readyForTransfer():
             gevent.sleep(0.3)
             if time.time() - t0 > timeout:
-                logging.getLogger("HWR").warning(
-                    "CRYOTONG: timeout waiting for transfer phase"
-                )
+                self.log.warning("CRYOTONG: timeout waiting for transfer phase")
                 break
-            logging.getLogger("HWR").warning(
-                "CRYOTONG: waiting for transfer phase to be set"
-            )
+            self.log.warning("CRYOTONG: waiting for transfer phase to be set")
 
         if not self.environment.readyForTransfer():
             return False
 
-        logging.getLogger("HWR").warning("CRYOTONG: ready for transfer now")
+        self.log.warning("CRYOTONG: ready for transfer now")
         return True
 
     # ## (END) OVERLOADED CATS90 methods ####

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Energy.py

@@ -1,6 +1,5 @@
 # from qt import *
 
-import logging
 import time
 
 from mxcubecore.Command.Tango import DeviceProxy
@@ -50,13 +49,13 @@ class PX1Energy(Device, AbstractEnergy):
 
     def connect_notify(self, signal):
         if signal == "energyChanged":
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "PX1Energy. connect_notify. sending energy value %s" % self.get_value()
             )
             self.energyChanged(self.get_energy())
 
         if signal == "stateChanged":
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "PX1Energy. connect_notify. sending state value %s" % self.get_state()
             )
             self.stateChanged(self.get_state())
@@ -179,7 +178,7 @@ class PX1Energy(Device, AbstractEnergy):
                             self.und_device.gap = newgap + backlash
                         time.sleep(1)
                 except Exception:
-                    logging.getLogger("HWR").error(
+                    self.log.error(
                         "%s: Cannot move undulator U20 : State device = %s",
                         self.id,
                         str(self.und_device.State()),
@@ -189,14 +188,14 @@ class PX1Energy(Device, AbstractEnergy):
                 self.energy_chan.set_value(value)
                 return value
             except Exception:
-                logging.getLogger("HWR").error(
+                self.log.error(
                     "%s: Cannot move Energy : State device = %s",
                     self.id,
                     self.get_state(),
                 )
 
         else:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "%s: Cannot move Energy : State device = %s",
                 self.id,
                 self.get_state(),
@@ -204,7 +203,7 @@ class PX1Energy(Device, AbstractEnergy):
 
     def set_wavelength(self, value, wait=False):
         egy_value = self.lambda_to_energy(float(value))
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "%s: Moving wavelength to : %s (egy to %s" % (self.id, value, egy_value)
         )
         self.set_valuey(egy_value)

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1EnergyScan.py

@@ -58,7 +58,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
         self.scan_info = {}
         self.scan_data = []
 
-        self.log = logging.getLogger("HWR")
+        self.log = self.log
 
     def init(self):
         self.ready_event = gevent.event.Event()
@@ -268,7 +268,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
     def start_energy_scan(
         self, element, edge, directory, prefix, session_id=None, blsample_id=None
     ):
-        log = logging.getLogger("HWR")
+        log = self.log
 
         self.scan_info = {
             "sessionId": session_id,
@@ -315,7 +315,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
         except Exception:
             import traceback
 
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "EnergyScan: problem starting energy scan. %s" % traceback.format_exc()
             )
             self.scanCommandFailed()
@@ -379,7 +379,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
         self.ready_event.set()
 
     def scanCommandFinished(self, *args):
-        logging.getLogger("HWR").debug("EnergyScan: finished")
+        self.log.debug("EnergyScan: finished")
 
         with cleanup(self.ready_event.set):
             self.scan_info["endTime"] = time.strftime("%Y-%m-%d %H:%M:%S")
@@ -425,17 +425,13 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
             if not os.path.exists(archive_directory):
                 os.makedirs(archive_directory)
         except Exception:
-            logging.getLogger("HWR").exception(
-                "PX1EnergyScan: could not create results directory."
-            )
+            self.log.exception("PX1EnergyScan: could not create results directory.")
             self.store_energy_scan()
             self.scanCommandFailed()
             return
 
         if not self.save_raw(scan_file_raw_filename, archive_file_raw_filename):
-            logging.getLogger("HWR").exception(
-                "PX1EnergyScan: could not save data raw file"
-            )
+            self.log.exception("PX1EnergyScan: could not save data raw file")
             self.store_energy_scan()
             self.scanCommandFailed()
             return
@@ -490,9 +486,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
                 ) = result_data
             else:
                 self.store_energy_scan()
-                logging.getLogger("HWR").error(
-                    "Energy scan: Chooch cannot parse results"
-                )
+                self.log.error("Energy scan: Chooch cannot parse results")
                 return
             # scan_data = self.get_scan_data()
             # self.log.debug("running chooch with values: element=%s, element=%s" % (elt,edge))
@@ -507,7 +501,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
 
             self.log.debug(traceback.format_exc())
             self.store_energy_scan()
-            logging.getLogger("HWR").error("Energy scan: Chooch failed")
+            self.log.error("Energy scan: Chooch failed")
             return
 
         self.log.info("EnergyScan. running chooch done")
@@ -524,7 +518,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
 
         self.thEdge = self.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)
         )
@@ -541,20 +535,20 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
             ip = 0
             rm = self.thEdge + 0.03
 
-            logging.getLogger("HWR").warning(
+            self.log.warning(
                 "EnergyScan: calculated peak is %s theoretical value more than 20eV"
                 % side
             )
-            logging.getLogger("HWR").warning("   calculated = %s" % savpk)
-            logging.getLogger("HWR").warning("  theoretical = %s" % self.thEdge)
+            self.log.warning("   calculated = %s" % savpk)
+            self.log.warning("  theoretical = %s" % self.thEdge)
 
         if not self.copy_efs(scan_file_efs_filename, archive_file_efs_filename):
-            logging.getLogger("HWR").warning("  copy efs failed ")
+            self.log.warning("  copy efs failed ")
             self.store_energy_scan()
             self.scanCommandFailed()
             return
 
-        logging.getLogger("HWR").warning(
+        self.log.warning(
             "  efs file has been archived at %s" % archive_file_efs_filename
         )
 
@@ -574,16 +568,14 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
         self.scan_info["filename"] = archive_file_raw_filename
         # self.scan_info["workingDirectory"] = archive_directory
 
-        logging.getLogger("HWR").warning(
-            "  generating graph data from %s" % str(chooch_graph_data)
-        )
+        self.log.warning("  generating graph data from %s" % str(chooch_graph_data))
 
         chooch_graph_x, chooch_graph_y1, chooch_graph_y2 = zip(*chooch_graph_data)
         chooch_graph_x = list(chooch_graph_x)
         for i in range(len(chooch_graph_x)):
             chooch_graph_x[i] = chooch_graph_x[i] / 1000.0
 
-        logging.getLogger("HWR").info("PX1EnergScan. Saving png")
+        self.log.info("PX1EnergScan. Saving png")
 
         # prepare to save png files
         title = "%10s  %6s  %6s\n%10s  %6.2f  %6.2f\n%10s  %6.2f  %6.2f" % (
@@ -620,21 +612,21 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
         self.scan_info["jpegChoochFileFullPath"] = str(escan_ispyb_path)
 
         try:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Rendering energy scan and Chooch graphs to PNG file : %s",
                 scan_file_png_filename,
             )
             canvas.print_figure(scan_file_png_filename, 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(
                 "Rendering energy scan and Chooch graphs to PNG file : %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()
 
@@ -680,9 +672,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
             self.log.info("EnergyScan. saving data in %s" % scan_filename)
             self.log.info("EnergyScan. archiving data in %s" % archive_filename)
         except Exception:
-            logging.getLogger("HWR").exception(
-                "EMBLEnergyScan: could not create results raw file"
-            )
+            self.log.exception("EMBLEnergyScan: could not create results raw file")
             return False
 
         scan_data = self.get_scan_data()

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Environment.py

@@ -296,7 +296,7 @@ class PX1Environment(HardwareObject):
     def setAuthorizationFlag(self, value):
         # make here the logic with eventually other permits (like hardware permit)
         if value != self.auth:
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "PX1Environment. received authorization from cryotong:  %s" % value
             )
             self.auth = value

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1MiniDiff.py

@@ -54,16 +54,14 @@ class PX1MiniDiff(GenericDiffractometer):
                 if env_state != "RUNNING" and self.px1env_ho.isPhaseVisuSample():
                     break
                 if time.time() - t0 > timeout:
-                    logging.getLogger("HWR").debug(
-                        "timeout sending supervisor to sample view phase"
-                    )
+                    self.log.debug("timeout sending supervisor to sample view phase")
                     break
                 gevent.sleep(0.1)
 
         self.lightarm_hwobj.adjustLightLevel()
 
     def smargon_state_changed(self, value):
-        logging.getLogger("HWR").debug("smargon state changed")
+        self.log.debug("smargon state changed")
         self.smargon_state = value
         self.emit("minidiffStateChanged", (value,))
 
@@ -106,7 +104,7 @@ class PX1MiniDiff(GenericDiffractometer):
     def px1_manual_centring(self, sample_info=None, wait_result=None):
         """ """
         self.emit_progress_message("Manual 3 click centring...")
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "   starting manual 3 click centring. phiy is %s" % str(self.centring_phiy)
         )
 
@@ -137,7 +135,7 @@ class PX1MiniDiff(GenericDiffractometer):
         """
         Descript. :
         """
-        logging.getLogger("HWR").debug("Diffractometer: centring procedure done.")
+        self.log.debug("Diffractometer: centring procedure done.")
         try:
             motor_pos = centring_procedure.get()
             if isinstance(motor_pos, gevent.GreenletExit):
@@ -146,15 +144,11 @@ class PX1MiniDiff(GenericDiffractometer):
             logging.exception("Could not complete centring")
             self.emit_centring_failed()
         else:
-            logging.getLogger("HWR").debug(
-                "Diffractometer: centring procedure done. %s" % motor_pos
-            )
+            self.log.debug("Diffractometer: centring procedure done. %s" % motor_pos)
 
             for motor in motor_pos:
                 position = motor_pos[motor]
-                logging.getLogger("HWR").debug(
-                    "   - motor is %s - going to %s" % (motor.id, position)
-                )
+                self.log.debug("   - motor is %s - going to %s" % (motor.id, position))
 
             self.emit_progress_message("Moving sample to centred position...")
             self.emit_centring_moving()
@@ -213,12 +207,10 @@ class PX1MiniDiff(GenericDiffractometer):
             # We do not want to modify the input dict
             motor_positions_copy = motor_positions.copy()
 
-        logging.getLogger("HWR").debug(
-            "MiniDiff moving motors. %s" % str(motor_positions_copy)
-        )
+        self.log.debug("MiniDiff moving motors. %s" % str(motor_positions_copy))
 
         self.wait_device_ready(timeout)
-        logging.getLogger("HWR").debug("   now ready to move them")
+        self.log.debug("   now ready to move them")
         for motor in motor_positions_copy.keys():
             position = motor_positions_copy[motor]
             if type(motor) in (str, unicode):
@@ -229,19 +221,17 @@ class PX1MiniDiff(GenericDiffractometer):
                     continue
                 motor_positions_copy[motor] = position
 
-            logging.getLogger("HWR").debug(
-                "  / moving motor. %s to %s" % (motor.id, position)
-            )
+            self.log.debug("  / moving motor. %s to %s" % (motor.id, position))
             self.wait_device_ready(timeout)
             try:
                 motor.set_value(position, timeout=None)
             except Exception:
                 import traceback
 
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "  / error moving motor on diffractometer. state is %s"
                     % (self.smargon_state)
                 )
-                logging.getLogger("HWR").debug("     / %s " % traceback.format_exc())
+                self.log.debug("     / %s " % traceback.format_exc())
 
         self.wait_device_ready(timeout)