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

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Pilatus.py

@@ -111,7 +111,7 @@ class PX1Pilatus(AbstractDetector, HardwareObject):
                 beam_x = value[0]
                 beam_y = value[1]
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
         return beam_x, beam_y
 
     def get_manufacturer(self):
@@ -158,15 +158,15 @@ class PX1Pilatus(AbstractDetector, HardwareObject):
         # trig_mode = "EXTERNAL_TRIGGER"
         # latency_time = 0.023
         #
-        # logging.getLogger("HWR").debug(" Preparing detector (dev=%s) for data collection" % self.devname)
+        # self.log.debug(" Preparing detector (dev=%s) for data collection" % self.devname)
         #
-        # logging.getLogger("HWR").debug("    /saving directory: %s" % basedir)
-        # logging.getLogger("HWR").debug("    /prefix          : %s" % prefix)
-        # logging.getLogger("HWR").debug("    /saving_format   : %s" % fileformat)
-        # logging.getLogger("HWR").debug("    /trigger_mode    : %s" % trig_mode)
-        # logging.getLogger("HWR").debug("    /acq_nb_frames   : %s" % nb_frames)
-        # logging.getLogger("HWR").debug("    /acq_expo_time   : %s" % exp_time)
-        # logging.getLogger("HWR").debug("    /latency_time    : %s" % latency_time)
+        # self.log.debug("    /saving directory: %s" % basedir)
+        # self.log.debug("    /prefix          : %s" % prefix)
+        # self.log.debug("    /saving_format   : %s" % fileformat)
+        # self.log.debug("    /trigger_mode    : %s" % trig_mode)
+        # self.log.debug("    /acq_nb_frames   : %s" % nb_frames)
+        # self.log.debug("    /acq_expo_time   : %s" % exp_time)
+        # self.log.debug("    /latency_time    : %s" % latency_time)
         #
         # self.device.write_attribute('saving_mode', 'AUTO_FRAME')
         # self.device.write_attribute('saving_directory', basedir)

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Pss.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import logging
 
 from mxcubecore.BaseHardwareObjects import HardwareObject
 
@@ -13,7 +12,7 @@ class PX1Pss(HardwareObject):
 
     def value_changed(self, value):
         state = self.get_state(value)
-        logging.getLogger("HWR").debug("state changed. value is %s" % state)
+        self.log.debug("state changed. value is %s" % state)
         self.emit("stateChanged", (state,))
 
     def get_state(self, value=None):

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Resolution.py

@@ -1,5 +1,3 @@
-import logging
-
 from mxcubecore.BaseHardwareObjects import HardwareObject
 
 DETECTOR_DIAMETER = 424.0
@@ -143,9 +141,7 @@ class PX1Resolution(HardwareObject):
         try:
             self.stop_command()
         except Exception:
-            logging.getLogger("HWR").err(
-                "%s: PX1Resolution.stop: error while trying to stop!", self.id
-            )
+            self.log.err("%s: PX1Resolution.stop: error while trying to stop!", self.id)
 
     def re_emit_values(self):
         self.stateChanged()

mxcubecore/HardwareObjects/SOLEIL/PX1/PX1TangoLight.py

@@ -1,4 +1,3 @@
-import logging
 import time
 
 from mxcubecore.BaseHardwareObjects import HardwareObject
@@ -86,9 +85,7 @@ class PX1TangoLight(HardwareObject):
 
     def zoom_changed(self, position_name, value):
         if self.currentState == "in":
-            logging.getLogger("HWR").debug(
-                "Zoom changed. and light is in. setting light level"
-            )
+            self.log.debug("Zoom changed. and light is in. setting light level")
             self.adjustLightLevel()
 
     def adjustLightLevel(self):
@@ -102,9 +99,7 @@ class PX1TangoLight(HardwareObject):
                 light_level = float(props["lightLevel"])
                 light_current = self.light_hwo.get_value()
                 if light_current != light_level:
-                    logging.getLogger("HWR").debug(
-                        "Setting light level to %s" % light_level
-                    )
+                    self.log.debug("Setting light level to %s" % light_level)
                     self.light_hwo.set_value(light_level)
         except Exception:
-            logging.getLogger("HWR").debug("Cannot set light level")
+            self.log.debug("Cannot set light level")

mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Attenuator.py

@@ -99,7 +99,7 @@ class PX2Attenuator(HardwareObject):
             logging.getLogger().debug("Attenuator state read from the device %s", value)
 
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "%s getAttState : received value on channel is not a integer value",
                 str(self.name()),
             )
@@ -108,9 +108,7 @@ class PX2Attenuator(HardwareObject):
 
     def attStateChanged(self, channelValue):
         value = self.getAttState()
-        logging.getLogger("HWR").error(
-            "%s getAttState : new value is %s" % (str(self.name()), value)
-        )
+        self.log.error("%s getAttState : new value is %s" % (str(self.name()), value))
         self.emit("attStateChanged", (value,))
 
     def get_value(self):
@@ -131,7 +129,7 @@ class PX2Attenuator(HardwareObject):
             # Trouver la valeur de transmission par mesure sur QBPM1 doit etre autour
             # de 120%
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "%s get_value : received value on channel is not a float value",
                 str(self.name()),
             )
@@ -146,18 +144,18 @@ class PX2Attenuator(HardwareObject):
 
     def attFactorChanged(self, channelValue):
         try:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "%s attFactorChanged : received value %s"
                 % (str(self.name()), channelValue)
             )
             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()),
             )
         else:
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "%s attFactorChanged : calculated value is %s"
                 % (str(self.name()), value)
             )
@@ -167,7 +165,7 @@ class PX2Attenuator(HardwareObject):
         try:
             value = int(channelValue)
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "%s attToggleChanged : received value on channel is not a float value",
                 str(self.name()),
             )
@@ -180,9 +178,7 @@ class PX2Attenuator(HardwareObject):
             if (
                 self.Constdevice.FP_Area_FWHM <= 0.1
             ):  # Cas ou il n'y a pas de valeur dans le publisher PASSERELLE/CO/Primary_Slits
-                logging.getLogger("HWR").error(
-                    "Primary slits not correctly aligned", str(self.name())
-                )
+                self.log.error("Primary slits not correctly aligned", str(self.name()))
                 self.Constdevice.FP_Area_FWHM = 0.5
                 self.Constdevice.Ratio_FP_Gap = 0.5
 
@@ -200,7 +196,7 @@ class PX2Attenuator(HardwareObject):
             self.Ps_vdevice.gap = newGapFP_V
             # self.attFactorChanged(channelValue)
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "%s set Transmission : received value on channel is not valid",
                 str(self.name()),
             )

mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Collect.py

@@ -89,7 +89,7 @@ class PX2Collect(AbstractCollect, HardwareObject):
             for undulator in self["undulators"]:
                 undulators.append(undulator)
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         beam_div_hor, beam_div_ver = HWR.beamline.beam.get_beam_divergence()
 

mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Diffractometer.py

@@ -136,7 +136,7 @@ class PX2Diffractometer(GenericDiffractometer):
             [(value, key) for key, value in self.motor_name_mapping]
         )
 
-        self.log = logging.getLogger("HWR")
+        self.log = self.log
 
     def init(self):
         """
@@ -243,7 +243,7 @@ class PX2Diffractometer(GenericDiffractometer):
         self.beam_position = value
 
     def state_changed(self, state):
-        # logging.getLogger("HWR").debug("State changed: %s" % str(state))
+        # self.log.debug("State changed: %s" % str(state))
         if self.current_state != state:
             self.current_state = state
             self.emit("minidiffStateChanged", (self.current_state))
@@ -405,7 +405,7 @@ class PX2Diffractometer(GenericDiffractometer):
             GenericDiffractometer.PHASE_BEAM,
         ):
             detector_distance = HWR.beamline.detector.distance.get_value()
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "Diffractometer current phase: %s " % self.current_phase
                 + "selected phase: %s " % phase
                 + "detector distance: %d mm" % detector_distance
@@ -576,7 +576,7 @@ class PX2Diffractometer(GenericDiffractometer):
                 self, x, y, omega=self.goniometer.get_omega_position()
             )
         else:
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "Diffractometer: Move to screen"
                 + " position disabled in BeamLocation phase."
             )
@@ -646,7 +646,7 @@ class PX2Diffractometer(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))
 
             if k <= n_clicks:
                 self.goniometer.set_position({"Omega": omega + step})
@@ -995,13 +995,17 @@ class PX2Diffractometer(GenericDiffractometer):
                     self.motor_hwobj_dict["sampx"]: centred_position.sampx,
                     self.motor_hwobj_dict["sampy"]: centred_position.sampy,
                     self.motor_hwobj_dict["phi"]: centred_position.phi,
-                    self.motor_hwobj_dict["phiy"]: centred_position.phiy
-                    + self.centring_hwobj.camera2alignmentMotor(
-                        self.motor_hwobj_dict["phiy"], {"X": dx, "Y": dy}
+                    self.motor_hwobj_dict["phiy"]: (
+                        centred_position.phiy
+                        + self.centring_hwobj.camera2alignmentMotor(
+                            self.motor_hwobj_dict["phiy"], {"X": dx, "Y": dy}
+                        )
                     ),
-                    self.motor_hwobj_dict["phiz"]: centred_position.phiz
-                    + self.centring_hwobj.camera2alignmentMotor(
-                        self.motor_hwobj_dict["phiz"], {"X": dx, "Y": dy}
+                    self.motor_hwobj_dict["phiz"]: (
+                        centred_position.phiz
+                        + self.centring_hwobj.camera2alignmentMotor(
+                            self.motor_hwobj_dict["phiz"], {"X": dx, "Y": dy}
+                        )
                     ),
                     self.motor_hwobj_dict["kappa"]: centred_position.kappa,
                     self.motor_hwobj_dict["kappa_phi"]: centred_position.kappa_phi,
@@ -1010,9 +1014,7 @@ class PX2Diffractometer(GenericDiffractometer):
             except Exception:
                 logging.exception("Could not move to centred position")
         else:
-            logging.getLogger("HWR").debug(
-                "Move to centred position disabled in BeamLocation phase."
-            )
+            self.log.debug("Move to centred position disabled in BeamLocation phase.")
 
     def move_to_motors_positions(self, motors_positions, wait=False):
         """ """
@@ -1070,9 +1072,7 @@ class PX2Diffractometer(GenericDiffractometer):
         Descript. :
         """
         if self.in_plate_mode():
-            logging.getLogger("HWR").info(
-                "PX2Diffractometer: Visual align not available in Plate mode"
-            )
+            self.log.info("PX2Diffractometer: Visual align not available in Plate mode")
         else:
             t1 = [point_1.sampx, point_1.sampy, point_1.phiy]
             t2 = [point_2.sampx, point_2.sampy, point_2.phiy]
@@ -1136,14 +1136,14 @@ class PX2Diffractometer(GenericDiffractometer):
 
     def close_kappa_task(self):
         """Close kappa task"""
-        logging.getLogger("HWR").debug("Started closing Kappa")
+        self.log.debug("Started closing Kappa")
         self.move_kappa_and_phi_procedure(0, None)
         self.wait_device_ready(60)
         self.motor_hwobj_dict["kappa"].homeMotor()
         self.wait_device_ready(60)
         self.move_kappa_and_phi_procedure(0, None)
         self.wait_device_ready(60)
-        logging.getLogger("HWR").debug("Done closing Kappa")
+        self.log.debug("Done closing Kappa")
         # self.kappa_phi_motor_hwobj.homeMotor()
 
     def set_zoom(self, position):
@@ -1402,14 +1402,14 @@ class PX2Diffractometer(GenericDiffractometer):
         try:
             self.nclicks = int(nclicks)
         except Exception:
-            logging.getLogger("HWR").exception(traceback.format_exc())
+            self.log.exception(traceback.format_exc())
 
     def set_step(self, step):
         self.log.info("PX2Diffractometer: centring step changed: %s" % step)
         try:
             self.step = float(step)
         except Exception:
-            logging.getLogger("HWR").exception(traceback.format_exc())
+            self.log.exception(traceback.format_exc())
 
     def set_centring_method(self, centring_method):
         self.log.info(
@@ -1418,7 +1418,7 @@ class PX2Diffractometer(GenericDiffractometer):
         try:
             self.centring_method = centring_method
         except Exception:
-            logging.getLogger("HWR").exception(traceback.format_exc())
+            self.log.exception(traceback.format_exc())
 
     def is_ready(self):
         """

mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Energy.py

@@ -75,10 +75,10 @@ class PX2Energy(EnergyMockup):
         self.set_value(energy)
 
     def check_limits(self, value):
-        logging.getLogger("HWR").debug("Checking the move limits")
+        self.log.debug("Checking the move limits")
         en_lims = self.get_limits()
         if value >= self.en_lims[0] and value <= self.en_lims[1]:
-            logging.getLogger("HWR").info("Limits ok")
+            self.log.info("Limits ok")
             return True
         logging.getLogger("user_level_log").info("Requested value is out of limits")
         return False
@@ -97,12 +97,10 @@ class PX2Energy(EnergyMockup):
                 if self.current_wavelength is not None:
                     self.re_emit_values()
         except Exception:
-            logging.getLogger("HWR").info(
-                "energy_changed: error occured during an energy update"
-            )
+            self.log.info("energy_changed: error occured during an energy update")
 
     def energy_state_changed(self, state):
-        logging.getLogger("HWR").info("energy_state_changed %s" % str(state))
+        self.log.info("energy_state_changed %s" % str(state))
         # self.energy_server_check_for_errors(state)
         if state == "STANDBY":
             if self.moving:

mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Guillotine.py

@@ -123,7 +123,7 @@ class PX2Guillotine(BaseHardwareObjects.HardwareObject):
         try:
             self.pss_door = self.get_property("tangoname_pss")
         except Exception:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Guillotine I11-MA-CE/PSS/DB_DATA: tangopssDevice is not defined "
             )
 
@@ -131,7 +131,7 @@ class PX2Guillotine(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/SOLEILCatsMaint.py

@@ -264,14 +264,14 @@ class SOLEILCatsMaint(HardwareObject):
 
         self.running_safe = True
         self._update_message("RUNNING Safe process. Phase is: going to Safe")
-        logging.getLogger("HWR").info("Executing safe")
+        self.log.info("Executing safe")
         self._execute_server_task(self._cmdSafe, argin, waitstart=True)
-        logging.getLogger("HWR").info("Executing safe done")
+        self.log.info("Executing safe done")
 
         self._update_message("RUNNING Safe process. Phase is: Drying")
-        logging.getLogger("HWR").info("Executing dry")
+        self.log.info("Executing dry")
         self._execute_server_task(self._cmdDry, argin, waitstart=True)
-        logging.getLogger("HWR").info("Executing dry done")
+        self.log.info("Executing dry done")
 
         self._update_message("RUNNING Safe process. Phase is: SoakToolCal")
         logging.getLogger("Executing SoakToolCal")
@@ -484,13 +484,11 @@ class SOLEILCatsMaint(HardwareObject):
             t0 = time.time()
             while str(self._chnPathRunning.get_value()).lower() != "true":
                 if time.time() - t0 > timeout:
-                    logging.getLogger("HWR").info(
-                        "Could not detect the start of the task. Continuing"
-                    )
+                    self.log.info("Could not detect the start of the task. Continuing")
                     break
                 gevent.sleep(0.1)
 
-        logging.getLogger("HWR").info(
+        self.log.info(
             "server task started. path running %s" % self._chnPathRunning.get_value()
         )
         while str(self._chnPathRunning.get_value()).lower() == "true":