mxcubecore 1.393.0__tar.gz → 1.395.0__tar.gz

{mxcubecore-1.393.0 → mxcubecore-1.395.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.393.0
+Version: 1.395.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.393.0 → mxcubecore-1.395.0}/mxcubecore/HardwareObjects/ALBA/ALBAAutoProcessing.py

@@ -1,4 +1,3 @@
-import logging
 import math
 import os
 import sys
@@ -28,7 +27,7 @@ class ALBAAutoProcessing(HardwareObject):
 
         self.template_dir = self.get_property("template_dir")
         var_dsname = self.get_property("variables_ds")
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "ALBAAutoProcessing INIT: var_ds=%s, template_dir=%s"
             % (var_dsname, self.template_dir)
         )
@@ -194,15 +193,13 @@ class ALBAAutoProcessing(HardwareObject):
 
     # trigger auto processing for standard collection
     def trigger_auto_processing(self, dc_pars):
-        logging.getLogger("HWR").debug(
-            " ALBAAutoProcessing. triggering auto processing."
-        )
+        self.log.debug(" ALBAAutoProcessing. triggering auto processing.")
 
         dc_id = dc_pars["collection_id"]
         output_dir = dc_pars["ednaproc_dir"]
 
-        logging.getLogger("HWR").debug("    - collection_id = %s " % dc_id)
-        logging.getLogger("HWR").debug("    - output_dir    = %s " % output_dir)
+        self.log.debug("    - collection_id = %s " % dc_id)
+        self.log.debug("    - output_dir    = %s " % output_dir)
 
         job = ALBAEdnaProcJob()
         input_file = self.input_file  # TODO

{mxcubecore-1.393.0 → mxcubecore-1.395.0}/mxcubecore/HardwareObjects/ALBA/ALBABackLight.py

@@ -1,4 +1,3 @@
-import logging
 import time
 
 import gevent
@@ -102,7 +101,7 @@ class ALBABackLight(HardwareObject):
             self.set_backlight_in()
             wait_ok = self.wait_backlight_in()
             if not wait_ok:
-                logging.getLogger("HWR").debug("could not set backlight in")
+                self.log.debug("could not set backlight in")
                 return
 
         level = None
@@ -112,7 +111,7 @@ class ALBABackLight(HardwareObject):
         if not level or level < self.minimum_level:
             level = self.minimum_level
 
-        logging.getLogger("HWR").debug("setting light level to : %s" % level)
+        self.log.debug("setting light level to : %s" % level)
         self.setLevel(level)
 
     def set_backlight_in(self):
@@ -124,22 +123,22 @@ class ALBABackLight(HardwareObject):
         while elapsed < timeout:
             isin = self.backlightin_channel.get_value()
             if isin == state:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "waiting for backlight took %s . In is: %s" % (elapsed, isin)
                 )
                 return True
             gevent.sleep(0.1)
             elapsed = time.time() - t0
 
-        logging.getLogger("HWR").debug("Timeout waiting for backlight In")
+        self.log.debug("Timeout waiting for backlight In")
         return False
 
     def _task_finished(self, g):
-        logging.getLogger("HWR").debug("Backlight task finished")
+        self.log.debug("Backlight task finished")
         self._task = None
 
     def _task_failed(self, g):
-        logging.getLogger("HWR").debug("Backlight task failed")
+        self.log.debug("Backlight task failed")
         self._task = None
 
     def setOff(self):

{mxcubecore-1.393.0 → mxcubecore-1.395.0}/mxcubecore/HardwareObjects/ALBA/ALBABeamInfo.py

@@ -19,8 +19,6 @@ beamPosChanged
 -----------------------------------------------------------------------
 """
 
-import logging
-
 from mxcubecore.BaseHardwareObjects import HardwareObject
 
 
@@ -78,7 +76,7 @@ class ALBABeamInfo(HardwareObject):
                 self.get_property("beam_divergence_horizontal")
             )
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         self.default_beam_divergence = [
             default_beam_divergence_horizontal,
@@ -182,7 +180,7 @@ class ALBABeamInfo(HardwareObject):
         Arguments :
         Return    :
         """
-        logging.getLogger("HWR").debug(" emitting beam info")
+        self.log.debug(" emitting beam info")
         if (
             self.beam_info_dict["size_x"] != 9999
             and self.beam_info_dict["size_y"] != 9999

{mxcubecore-1.393.0 → mxcubecore-1.395.0}/mxcubecore/HardwareObjects/ALBA/ALBACats.py

@@ -143,7 +143,7 @@ class ALBACats(Cats90):
                 )
                 return False
 
-            logging.getLogger("HWR").debug("Supervisor waiting to finish phase change")
+            self.log.debug("Supervisor waiting to finish phase change")
             time.sleep(0.2)
 
         time.sleep(0.1)
@@ -189,9 +189,7 @@ class ALBACats(Cats90):
         @return:
         """
 
-        logging.getLogger("HWR").debug(
-            "Loading sample %s / type(%s)" % (sample, type(sample))
-        )
+        self.log.debug("Loading sample %s / type(%s)" % (sample, type(sample)))
 
         ret, msg = self._check_coherence()
         if not ret:
@@ -312,7 +310,7 @@ class ALBACats(Cats90):
         # get sample selection
         selected = self.get_selected_sample()
 
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "  ==========CATS=== selected sample is %s (prev %s)"
             % (str(selected), str(sample))
         )
@@ -344,9 +342,7 @@ class ALBACats(Cats90):
             )
 
         if not self.has_loaded_sample() and self.cats_sample_on_diffr() == 1:
-            logging.getLogger("HWR").warning(
-                "  ==========CATS=== sample on diffr, loading aborted"
-            )
+            self.log.warning("  ==========CATS=== sample on diffr, loading aborted")
             self._update_state()  # remove transient states like Loading. Reflect hardware state
             raise Exception(
                 "The sample "
@@ -373,15 +369,13 @@ class ALBACats(Cats90):
         if use_ht:  # loading HT sample
             if loaded_ht == -1:  # has loaded but it is not HT
                 # first unmount (non HT)
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "  ==========CATS=== mix load/unload dewar vs HT (NOT IMPLEMENTED YET)"
                 )
                 return
 
             argin = ["2", str(sample), "0", "0", xshift, yshift, zshift]
-            logging.getLogger("HWR").warning(
-                "  ==========CATS=== about to load HT. %s" % str(argin)
-            )
+            self.log.warning("  ==========CATS=== about to load HT. %s" % str(argin))
             if loaded_ht == 1:  # has ht loaded
                 cmd_ok = self._execute_server_task(
                     self._cmdChainedLoadHT, argin, waitsafe=True
@@ -397,7 +391,7 @@ class ALBACats(Cats90):
         else:
             if loaded_ht == 1:  # has an HT sample mounted
                 # first unmount HT
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "  ==========CATS=== mix load/unload dewar vs HT (NOT IMPLEMENTED YET)"
                 )
                 return
@@ -414,7 +408,7 @@ class ALBACats(Cats90):
             stype = self.get_cassette_type(basketno)
 
             if tool != current_tool:
-                logging.getLogger("HWR").warning(
+                self.log.warning(
                     "  ==========CATS=== changing tool from %s to %s"
                     % (current_tool, tool)
                 )
@@ -448,7 +442,7 @@ class ALBACats(Cats90):
                 )
             else:
                 if self.read_datamatrix:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== reading barcode only possible with spine pucks"
                     )
                 read_barcode = False
@@ -460,7 +454,7 @@ class ALBACats(Cats90):
                     )
 
                 if read_barcode:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== chained load sample (barcode), sending to cats:  %s"
                         % argin
                     )
@@ -468,7 +462,7 @@ class ALBACats(Cats90):
                         self._cmdChainedLoadBarcode, argin, waitsafe=True
                     )
                 else:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== chained load sample, sending to cats:  %s"
                         % argin
                     )
@@ -477,7 +471,7 @@ class ALBACats(Cats90):
                     )
             elif loaded_ht == 0:
                 if read_barcode:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== load sample (barcode), sending to cats:  %s"
                         % argin
                     )
@@ -485,7 +479,7 @@ class ALBACats(Cats90):
                         self._cmdLoadBarcode, argin, waitsafe=True
                     )
                 else:
-                    logging.getLogger("HWR").warning(
+                    self.log.warning(
                         "  ==========CATS=== load sample, sending to cats:  %s" % argin
                     )
                     cmd_ok = self._execute_server_task(
@@ -493,18 +487,18 @@ class ALBACats(Cats90):
                     )
 
         if not cmd_ok:
-            logging.getLogger("HWR").info("  LOAD Command failed on device server")
+            self.log.info("  LOAD Command failed on device server")
         elif self.auto_prepare_diff and not changing_tool:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "  AUTO_PREPARE_DIFF (On) sample changer is in safe state... preparing diff now"
             )
             # ret = self.diff_send_sampleview()
             self.go_sampleview_cmd()
-            logging.getLogger("HWR").info("     restoring detector distance")
+            self.log.info("     restoring detector distance")
             self.restore_detdist_position()
             self._wait_phase_done("SAMPLE")
         else:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "  AUTO_PREPARE_DIFF (Off) sample loading done / or changing tool (%s)"
                 % changing_tool
             )
@@ -548,7 +542,7 @@ class ALBACats(Cats90):
         loaded_num = self._chnNumLoadedSample.get_value()
 
         if loaded_lid == -1:
-            logging.getLogger("HWR").warning(
+            self.log.warning(
                 "  ==========CATS=== unload sample, no sample mounted detected"
             )
             return
@@ -561,7 +555,7 @@ class ALBACats(Cats90):
 
         argin = [str(tool), "0", xshift, yshift, zshift]
 
-        logging.getLogger("HWR").warning(
+        self.log.warning(
             "  ==========CATS=== unload sample, sending to cats:  %s" % argin
         )
         if loaded_ht == 1:

{mxcubecore-1.393.0 → mxcubecore-1.395.0}/mxcubecore/HardwareObjects/ALBA/ALBAClusterJob.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import sys
 import time
@@ -31,11 +30,11 @@ class ALBAClusterJob(object):
             return state
 
         while state in ["RUNNING", "PENDING"]:
-            logging.getLogger("HWR").debug("Job / is %s" % state)
+            self.log.debug("Job / is %s" % state)
             time.sleep(0.5)
             state = self.job.state
 
-        logging.getLogger("HWR").debug(' job finished with state: "%s"' % state)
+        self.log.debug(' job finished with state: "%s"' % state)
         return state
 
     def get_result(self, state):
@@ -68,7 +67,7 @@ class ALBAStrategyJob(ALBAClusterJob):
     sls_script = os.path.join(root, "edna-mx/strategy/edna-mx.strategy.sl")
 
     def run(self, *args):
-        logging.getLogger("HWR").debug("Starting StrategyJob - ")
+        self.log.debug("Starting StrategyJob - ")
 
         input_file, results_file, edna_directory = args
 
@@ -79,13 +78,13 @@ class ALBAStrategyJob(ALBAClusterJob):
         )
         self.job.submit()
 
-        logging.getLogger("HWR").debug("         StrategyJob - %s" % str(self.job))
+        self.log.debug("         StrategyJob - %s" % str(self.job))
 
         self.edna_directory = os.path.dirname(input_file)
         self.results_file = results_file
 
-        logging.getLogger("HWR").debug("  input file: %s" % input_file)
-        logging.getLogger("HWR").debug("  edna directory: %s" % self.edna_directory)
+        self.log.debug("  input file: %s" % input_file)
+        self.log.debug("  edna directory: %s" % self.edna_directory)
 
     def get_result(self, state):
         if state == "COMPLETED":
@@ -93,19 +92,19 @@ class ALBAStrategyJob(ALBAClusterJob):
                 self.edna_directory, "ControlInterfaceToMXCuBEv1_3_dataOutput.xml"
             )
 
-            logging.getLogger("HWR").debug("Job / state is COMPLETED")
-            logging.getLogger("HWR").debug("  looking for file: %s" % outfile)
+            self.log.debug("Job / state is COMPLETED")
+            self.log.debug("  looking for file: %s" % outfile)
             if os.path.exists(outfile):
                 job_output = open(outfile).read()
                 open(self.results_file, "w").write(job_output)
                 result = XSDataResultMXCuBE.parseFile(self.results_file)
             else:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "EDNA Job finished without success / cannot find output file "
                 )
                 result = ""
         else:
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "EDNA Job finished without success / state was %s" % (job.state)
             )
             result = ""

{mxcubecore-1.393.0 → mxcubecore-1.395.0}/mxcubecore/HardwareObjects/ALBA/ALBACollect.py

@@ -85,7 +85,7 @@ class ALBACollect(AbstractCollect):
             for undulator in self["undulators"]:
                 undulators.append(undulator)
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         self.exp_type_dict = {"Mesh": "raster", "Helical": "Helical"}
 
@@ -118,14 +118,14 @@ class ALBACollect(AbstractCollect):
     def data_collection_hook(self):
         """Main collection hook"""
 
-        logging.getLogger("HWR").info("Running ALBA data collection hook")
+        self.log.info("Running ALBA data collection hook")
 
-        logging.getLogger("HWR").info("  -- wait for devices to finish moving --")
-        logging.getLogger("HWR").info("       + wait for resolution...")
+        self.log.info("  -- wait for devices to finish moving --")
+        self.log.info("       + wait for resolution...")
         HWR.beamline.resolution.wait_end_of_move()
-        logging.getLogger("HWR").info("       + wait for detector distance...")
+        self.log.info("       + wait for detector distance...")
         HWR.beamline.detector.wait_move_distance_done()
-        logging.getLogger("HWR").info("       + wait for energy...")
+        self.log.info("       + wait for energy...")
         HWR.beamline.energy.wait_move_energy_done()
 
         if self.aborted_by_user:
@@ -136,44 +136,34 @@ class ALBACollect(AbstractCollect):
         ### EDNA_REF, OSC, MESH, HELICAL
 
         exp_type = self.current_dc_parameters["experiment_type"]
-        logging.getLogger("HWR").debug("Running a collect (exp_type=%s)" % exp_type)
+        self.log.debug("Running a collect (exp_type=%s)" % exp_type)
 
         if exp_type == "Characterization":
-            logging.getLogger("HWR").debug("Running a collect (CHARACTERIZATION)")
+            self.log.debug("Running a collect (CHARACTERIZATION)")
         elif exp_type == "Helical":
-            logging.getLogger("HWR").debug("Running a helical collection")
-            logging.getLogger("HWR").debug(
-                "   helical positions are: %s" % str(self.helical_positions)
-            )
+            self.log.debug("Running a helical collection")
+            self.log.debug("   helical positions are: %s" % str(self.helical_positions))
             hpos = self.helical_positions
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "               phiy from %3.4f to %3.4f" % (hpos[0], hpos[4])
             )
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "               phiz from %3.4f to %3.4f" % (hpos[1], hpos[5])
             )
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "              sampx from %3.4f to %3.4f" % (hpos[2], hpos[6])
             )
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "              sampy from %3.4f to %3.4f" % (hpos[3], hpos[7])
             )
         elif exp_type == "Mesh":
-            logging.getLogger("HWR").debug("Running a raster collection ()")
-            logging.getLogger("HWR").debug(
-                "   number of lines are: %s" % self.mesh_num_lines
-            )
-            logging.getLogger("HWR").debug(
-                "   total nb of frames: %s" % self.mesh_total_nb_frames
-            )
-            logging.getLogger("HWR").debug(
-                "          mesh range : %s" % self.mesh_range
-            )
-            logging.getLogger("HWR").debug(
-                "          mesh center : %s" % self.mesh_center
-            )
+            self.log.debug("Running a raster collection ()")
+            self.log.debug("   number of lines are: %s" % self.mesh_num_lines)
+            self.log.debug("   total nb of frames: %s" % self.mesh_total_nb_frames)
+            self.log.debug("          mesh range : %s" % self.mesh_range)
+            self.log.debug("          mesh center : %s" % self.mesh_center)
         else:
-            logging.getLogger("HWR").debug("Running a collect (STANDARD)")
+            self.log.debug("Running a collect (STANDARD)")
 
         osc_seq = self.current_dc_parameters["oscillation_sequence"][0]
 
@@ -194,7 +184,7 @@ class ALBACollect(AbstractCollect):
 
         omega_pos = osc_seq["start"]
 
-        logging.getLogger("HWR").info("Starting detector")
+        self.log.info("Starting detector")
         self.emit("collectStarted", (self.owner, 1))
 
         first_image_no = osc_seq["start_image_number"]
@@ -221,9 +211,7 @@ class ALBACollect(AbstractCollect):
         #
         # Run
         #
-        logging.getLogger("HWR").info(
-            "collecting images, by moving omega to %s" % final_pos
-        )
+        self.log.info("collecting images, by moving omega to %s" % final_pos)
         HWR.beamline.diffractometer.omega.set_value(final_pos)
         self.wait_collection_done(nb_images, first_image_no)
         self.data_collection_end()
@@ -235,9 +223,7 @@ class ALBACollect(AbstractCollect):
         self.unconfigure_ni()
 
     def data_collection_failed(self):
-        logging.getLogger("HWR").info(
-            "Data collection failed. recovering sequence should go here"
-        )
+        self.log.info("Data collection failed. recovering sequence should go here")
 
     def prepare_acquisition(self):
         fileinfo = self.current_dc_parameters["fileinfo"]
@@ -269,19 +255,17 @@ class ALBACollect(AbstractCollect):
             return False
 
         gevent.sleep(1)
-        logging.getLogger("HWR").info(
+        self.log.info(
             " Waiting for diffractometer to be ready. Now %s"
             % str(HWR.beamline.diffractometer.current_state)
         )
         HWR.beamline.diffractometer.wait_device_ready(timeout=10)
-        logging.getLogger("HWR").info("             diffractometer is now ready.")
+        self.log.info("             diffractometer is now ready.")
 
         # go to collect phase
         if not self.is_collect_phase():
-            logging.getLogger("HWR").info(
-                " Not in collect phase. Asking supervisor to go"
-            )
-            logging.getLogger("HWR").info(
+            self.log.info(" Not in collect phase. Asking supervisor to go")
+            self.log.info(
                 "  diffractometer is now ready. Now %s"
                 % str(HWR.beamline.diffractometer.current_state)
             )
@@ -310,16 +294,14 @@ class ALBACollect(AbstractCollect):
         total_time = nb_images * exp_time
         omega_speed = float(total_dist / total_time)
 
-        logging.getLogger("HWR").info("  prepare detector  was not ok.")
+        self.log.info("  prepare detector  was not ok.")
         self.write_image_headers(start_angle)
 
-        logging.getLogger("HWR").info(
+        self.log.info(
             "  nb_images: %s / img_range: %s / exp_time: %s / total_distance: %s / speed: %s"
             % (nb_images, img_range, exp_time, total_dist, omega_speed)
         )
-        logging.getLogger("HWR").info(
-            "  setting omega velocity to 60 to go to intial position"
-        )
+        self.log.info("  setting omega velocity to 60 to go to intial position")
         HWR.beamline.diffractometer.omega.set_velocity(60)
 
         omega_acceltime = HWR.beamline.diffractometer.omega.get_acceleration()
@@ -329,21 +311,21 @@ class ALBACollect(AbstractCollect):
         init_pos = start_angle - safe_delta
         final_pos = start_angle + total_dist + safe_delta
 
-        logging.getLogger("HWR").info("Moving omega to initial position %s" % init_pos)
+        self.log.info("Moving omega to initial position %s" % init_pos)
         HWR.beamline.diffractometer.omega.set_value(init_pos)
 
         HWR.beamline.detector.prepare_collection(nb_images, first_image_no)
 
         HWR.beamline.diffractometer.omega.wait_end_of_move(timeout=10)
 
-        logging.getLogger("HWR").info(
+        self.log.info(
             "Moving omega finished at %s"
             % HWR.beamline.diffractometer.omega.get_value()
         )
 
         # program omega speed depending on exposure time
 
-        logging.getLogger("HWR").info("Setting omega velocity to %s" % omega_speed)
+        self.log.info("Setting omega velocity to %s" % omega_speed)
         HWR.beamline.diffractometer.omega.set_velocity(omega_speed)
         if omega_speed != 0:
             self.configure_ni(start_angle, total_dist)
@@ -452,12 +434,12 @@ class ALBACollect(AbstractCollect):
 
         start_wait = time.time()
 
-        logging.getLogger("HWR").debug("   waiting for image on disk: %s", fullpath)
+        self.log.debug("   waiting for image on disk: %s", fullpath)
 
         while not os.path.exists(fullpath):
             dirlist = os.listdir(basedir)  # forces directory flush ?
             if (time.time() - start_wait) > timeout:
-                logging.getLogger("HWR").debug("   giving up waiting for image")
+                self.log.debug("   giving up waiting for image")
                 return False
             time.sleep(0.2)
 
@@ -473,7 +455,7 @@ class ALBACollect(AbstractCollect):
         thumb_fullpath = os.path.join(archive_dir, thumb_filename)
         jpeg_fullpath = os.path.join(archive_dir, jpeg_filename)
 
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "   creating thumbnails for  %s in: %s and %s"
             % (fullpath, jpeg_fullpath, thumb_fullpath)
         )
@@ -482,7 +464,7 @@ class ALBACollect(AbstractCollect):
         cmd = "adxv_thumb 0.1 %s %s" % (fullpath, thumb_fullpath)
         os.system(cmd)
 
-        logging.getLogger("HWR").debug("   writing thumbnails info in LIMS")
+        self.log.debug("   writing thumbnails info in LIMS")
         self._store_image_in_lims(frame_number)
 
         return True
@@ -514,7 +496,7 @@ class ALBACollect(AbstractCollect):
         #
         # data collection end (or abort)
         #
-        logging.getLogger("HWR").info(" finishing data collection ")
+        self.log.info(" finishing data collection ")
         HWR.beamline.fast_shutter.cmdOut()
         self.emit("progressStop")
 
@@ -552,9 +534,9 @@ class ALBACollect(AbstractCollect):
         self.data_collection_end()
 
     def go_to_collect(self, timeout=180):
-        logging.getLogger("HWR").debug("sending supervisor to collect phase")
+        self.log.debug("sending supervisor to collect phase")
         self.supervisor_hwobj.go_collect()
-        logging.getLogger("HWR").debug("supervisor sent to collect phase")
+        self.log.debug("supervisor sent to collect phase")
 
         gevent.sleep(0.5)
 
@@ -565,13 +547,11 @@ class ALBACollect(AbstractCollect):
             if super_state != "MOVING" and cphase == "COLLECT":
                 break
             if time.time() - t0 > timeout:
-                logging.getLogger("HWR").debug(
-                    "timeout sending supervisor to collect phase"
-                )
+                self.log.debug("timeout sending supervisor to collect phase")
                 break
             gevent.sleep(0.5)
 
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "supervisor finished go collect phase task. phase is now: %s" % cphase
         )
 
@@ -581,9 +561,9 @@ class ALBACollect(AbstractCollect):
         return self.supervisor_hwobj.get_current_phase().upper() == "COLLECT"
 
     def go_to_sampleview(self, timeout=180):
-        logging.getLogger("HWR").debug("sending supervisor to sample view phase")
+        self.log.debug("sending supervisor to sample view phase")
         self.supervisor_hwobj.go_sample_view()
-        logging.getLogger("HWR").debug("supervisor sent to sample view phase")
+        self.log.debug("supervisor sent to sample view phase")
 
         gevent.sleep(0.5)
 
@@ -594,13 +574,11 @@ class ALBACollect(AbstractCollect):
             if super_state != "MOVING" and cphase == "SAMPLE":
                 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.5)
 
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "supervisor finished go sample view phase task. phase is now: %s" % cphase
         )
 
@@ -610,7 +588,7 @@ class ALBACollect(AbstractCollect):
         return self.supervisor_hwobj.get_current_phase().upper() == "SAMPLE"
 
     def configure_ni(self, startang, total_dist):
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "Configuring NI660 with pars 0, %s, %s, 0, 1" % (startang, total_dist)
         )
         self.ni_conf_cmd(0.0, startang, total_dist, 0, 1)
@@ -693,7 +671,7 @@ class ALBACollect(AbstractCollect):
             self.go_to_sampleview()
 
         HWR.beamline.sample_view.save_snapshot(filename)
-        logging.getLogger("HWR").debug(" - snapshot saved to %s" % filename)
+        self.log.debug(" - snapshot saved to %s" % filename)
 
     @task
     def move_motors(self, motor_position_dict):
@@ -815,7 +793,7 @@ class ALBACollect(AbstractCollect):
                 else:
                     return und_gaps
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
         return {}
 
     def get_slit_gaps(self):