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

mxcubecore/HardwareObjects/LNLS/LNLSEnergy.py

@@ -19,8 +19,6 @@
 
 """LNLS Energy"""
 
-import logging
-
 from mxcubecore.HardwareObjects.abstract.AbstractEnergy import AbstractEnergy
 from mxcubecore.HardwareObjects.LNLS.EPICSActuator import EPICSActuator
 
@@ -46,7 +44,7 @@ class LNLSEnergy(EPICSActuator, AbstractEnergy):
         value = super().get_value()
         # Nominal value stores last energy value with valid threshold energy
         # if abs(self._nominal_value - value) < 0.001:
-        #    logging.getLogger("HWR").info("Pilatus threshold is still okay.")
+        #    self.log.info("Pilatus threshold is still okay.")
         #    return value
 
         threshold_ok = self.check_threshold_energy(value)
@@ -60,7 +58,7 @@ class LNLSEnergy(EPICSActuator, AbstractEnergy):
     def check_threshold_energy(self, energy):
         """Returns whether detector threshold energy is valid or not."""
 
-        # logging.getLogger("HWR").info(
+        # self.log.info(
         # "Checking Pilatus threshold. Please wait..."
         # )
         # for i in range(3):
@@ -70,13 +68,13 @@ class LNLSEnergy(EPICSActuator, AbstractEnergy):
         threshold_ok = self.detector.set_threshold_energy(energy)
 
         if threshold_ok:
-            logging.getLogger("HWR").info("Pilatus threshold is okay.")
+            self.log.info("Pilatus threshold is okay.")
             # logging.getLogger("user_level_log").info(
             #    "Pilatus threshold is okay."
             # )
             return True
 
-        logging.getLogger("HWR").error("Pilatus threshold is not okay.")
+        self.log.error("Pilatus threshold is not okay.")
         # logging.getLogger("user_level_log").error(
         #    "Pilatus threshold is not okay."
         # )

mxcubecore/HardwareObjects/LNLS/LNLSPilatusDet.py

@@ -116,18 +116,18 @@ class LNLSPilatusDet(AbstractDetector):
         try:
             float(energy)
         except Exception as e:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Error while setting Pilatus threshold. Value must be float."
             )
 
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             return False
 
         target_threshold = energy / 2
         if abs(self.get_threshold_energy() - target_threshold) < 0.0001:
             return True
 
-        logging.getLogger("HWR").info("Setting Pilatus threshold...")
+        self.log.info("Setting Pilatus threshold...")
         for i in range(3):
             logging.getLogger("user_level_log").info("Setting Pilatus threshold...")
 
@@ -137,27 +137,25 @@ class LNLSPilatusDet(AbstractDetector):
         time.sleep(2)
         # Using epics because we need 'as_string' option
         status = self.pv_status.get(as_string=True)
-        logging.getLogger("HWR").info("Pilatus status: %s" % status)
+        self.log.info("Pilatus status: %s" % status)
 
         while status == "Setting threshold":
-            logging.getLogger("HWR").info(
-                "Pilatus status: %s (this may take a minute)..." % status
-            )
+            self.log.info("Pilatus status: %s (this may take a minute)..." % status)
             time.sleep(3)
             status = self.pv_status.get(as_string=True)
 
         self.threshold = self.get_threshold_energy()
-        logging.getLogger("HWR").info(
+        self.log.info(
             "Pilatus: current threshold is %s (target is %s)"
             % (self.threshold, target_threshold)
         )
         if status == "Camserver returned OK" and self.threshold == target_threshold:
-            logging.getLogger("HWR").info("Pilatus status: %s" % status)
-            logging.getLogger("HWR").info("Pilatus threshold successfully set.")
+            self.log.info("Pilatus status: %s" % status)
+            self.log.info("Pilatus threshold successfully set.")
             return True
 
-        logging.getLogger("HWR").error("Pilatus status: %s" % status)
-        logging.getLogger("HWR").error(
+        self.log.error("Pilatus status: %s" % status)
+        self.log.error(
             "Error while setting Pilatus threshold. Please, check the detector."
         )
         return False
@@ -177,22 +175,22 @@ class LNLSPilatusDet(AbstractDetector):
         try:
             float(wavelength)
         except Exception as e:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Error while setting Pilatus wavelength. Value must be float."
             )
 
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             return False
 
         # if abs(self.wavelength - wavelength) < 0.0001:
-        #    logging.getLogger("HWR").info(
+        #    self.log.info(
         #        "Pilatus wavelength still okay."
         #    )
         #    return True
 
         # As the set of Pilatus wavelength, det dist and beam xy is fast,
         # there is no need to compare the target value with the current one.
-        logging.getLogger("HWR").info("Setting Pilatus wavelength...")
+        self.log.info("Setting Pilatus wavelength...")
         self.set_channel_value(self.DET_WAVELENGTH, wavelength)
         time.sleep(0.6)
 
@@ -201,10 +199,10 @@ class LNLSPilatusDet(AbstractDetector):
         print("WAVELENGHT GOT: " + str(self.wavelength))
 
         if abs(self.wavelength - wavelength) < 0.0001:
-            logging.getLogger("HWR").info("Pilatus wavelength successfully set.")
+            self.log.info("Pilatus wavelength successfully set.")
             return True
 
-        logging.getLogger("HWR").error(
+        self.log.error(
             "Error while setting Pilatus wavelength. Please, check the detector."
         )
         return False
@@ -224,30 +222,30 @@ class LNLSPilatusDet(AbstractDetector):
         try:
             float(det_distance)
         except Exception as e:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Error while setting Pilatus det distance. Value must be float."
             )
 
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             return False
 
         # if abs(self.det_distance - det_distance) < 0.001:
-        #    logging.getLogger("HWR").info(
+        #    self.log.info(
         #        "Pilatus det distance still okay."
         #    )
         #    return True
 
-        logging.getLogger("HWR").info("Setting Pilatus det distance...")
+        self.log.info("Setting Pilatus det distance...")
         self.set_channel_value(self.DET_DETDIST, det_distance)
         time.sleep(0.3)
 
         self.det_distance = self.get_detector_distance()
 
         if abs(self.det_distance - det_distance) < 0.001:
-            logging.getLogger("HWR").info("Pilatus det distance successfully set.")
+            self.log.info("Pilatus det distance successfully set.")
             return True
 
-        logging.getLogger("HWR").error(
+        self.log.error(
             "Error while setting Pilatus det distance. Please, check the detector."
         )
         return False
@@ -279,33 +277,33 @@ class LNLSPilatusDet(AbstractDetector):
         * default_beam_x (value set on xml file)
         """
         if from_user:
-            logging.getLogger("HWR").info("Getting beam X from user...")
+            self.log.info("Getting beam X from user...")
             beam_x = self.get_user_beam_x()
 
         if beam_x is None:
             if from_user:
-                logging.getLogger("HWR").error(
+                self.log.error(
                     "Could not get user beam X. Setting default value (from xml)."
                 )
             beam_x = self.default_beam_x
 
         # if abs(self.beam_x - beam_x) == 0:
-        #    logging.getLogger("HWR").info(
+        #    self.log.info(
         #        "Pilatus beam X still okay."
         #    )
         #    return True
 
-        logging.getLogger("HWR").info("Setting Pilatus beam X to {}...".format(beam_x))
+        self.log.info("Setting Pilatus beam X to {}...".format(beam_x))
         self.set_channel_value(self.DET_BEAM_X, beam_x)
         time.sleep(1)
 
         self.beam_x = self.get_beam_x()
 
         if float(self.beam_x) == float(beam_x):
-            logging.getLogger("HWR").info("Pilatus det beam X successfully set.")
+            self.log.info("Pilatus det beam X successfully set.")
             return True
 
-        logging.getLogger("HWR").error(
+        self.log.error(
             "Error while setting Pilatus beam X. Please, check the detector."
         )
         return False
@@ -337,33 +335,33 @@ class LNLSPilatusDet(AbstractDetector):
         * default_beam_y (value set on xml file)
         """
         if from_user:
-            logging.getLogger("HWR").info("Getting beam Y from user...")
+            self.log.info("Getting beam Y from user...")
             beam_y = self.get_user_beam_y()
 
         if beam_y is None:
             if from_user:
-                logging.getLogger("HWR").error(
+                self.log.error(
                     "Could not get user beam Y. Setting default value (from xml)."
                 )
             beam_y = self.default_beam_y
 
         # if abs(self.beam_y - beam_y) == 0:
-        #    logging.getLogger("HWR").info(
+        #    self.log.info(
         #        "Pilatus beam X still okay."
         #    )
         #    return True
 
-        logging.getLogger("HWR").info("Setting Pilatus beam Y to {}...".format(beam_y))
+        self.log.info("Setting Pilatus beam Y to {}...".format(beam_y))
         self.set_channel_value(self.DET_BEAM_Y, beam_y)
         time.sleep(1)
 
         self.beam_y = self.get_beam_y()
 
         if float(self.beam_y) == float(beam_y):
-            logging.getLogger("HWR").info("Pilatus det beam Y successfully set.")
+            self.log.info("Pilatus det beam Y successfully set.")
             return True
 
-        logging.getLogger("HWR").error(
+        self.log.error(
             "Error while setting Pilatus beam Y. Please, check the detector."
         )
         return False
@@ -383,26 +381,24 @@ class LNLSPilatusDet(AbstractDetector):
         try:
             float(transmission)
         except Exception as e:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Error while setting Pilatus transmission. Value must be float."
             )
 
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             return False
 
-        logging.getLogger("HWR").info(
-            "Setting Pilatus transmission to {}...".format(transmission)
-        )
+        self.log.info("Setting Pilatus transmission to {}...".format(transmission))
         self.set_channel_value(self.DET_TRANSMISSION, transmission)
         time.sleep(0.3)
 
         self.transmission = self.get_transmission()
 
         if abs(self.transmission - transmission) < 0.0001:
-            logging.getLogger("HWR").info("Pilatus transmission successfully set.")
+            self.log.info("Pilatus transmission successfully set.")
             return True
 
-        logging.getLogger("HWR").error(
+        self.log.error(
             "Error while setting Pilatus transmission. Please, check the detector."
         )
         return False
@@ -422,26 +418,24 @@ class LNLSPilatusDet(AbstractDetector):
         try:
             float(start_angle)
         except Exception as e:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Error while setting Pilatus start angle. Value must be float."
             )
 
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             return False
 
-        logging.getLogger("HWR").info(
-            "Setting Pilatus start angle to {}...".format(start_angle)
-        )
+        self.log.info("Setting Pilatus start angle to {}...".format(start_angle))
         self.set_channel_value(self.DET_START_ANGLE, start_angle)
         time.sleep(3)
 
         self.start_angle = self.get_start_angle()
 
         if abs(self.start_angle - start_angle) < 0.0001:
-            logging.getLogger("HWR").info("Pilatus start angle successfully set.")
+            self.log.info("Pilatus start angle successfully set.")
             return True
 
-        logging.getLogger("HWR").error(
+        self.log.error(
             "Error while setting Pilatus start angle. Please, check the detector."
         )
         return False
@@ -461,26 +455,24 @@ class LNLSPilatusDet(AbstractDetector):
         try:
             float(angle_incr)
         except Exception as e:
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Error while setting Pilatus angle increment. Value must be float."
             )
 
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
             return False
 
-        logging.getLogger("HWR").info(
-            "Setting Pilatus angle increment to {}...".format(angle_incr)
-        )
+        self.log.info("Setting Pilatus angle increment to {}...".format(angle_incr))
         self.set_channel_value(self.DET_ANGLE_INCR, angle_incr)
         time.sleep(3)
 
         self.angle_incr = self.get_angle_incr()
 
         if abs(self.angle_incr - angle_incr) < 0.0001:
-            logging.getLogger("HWR").info("Pilatus angle increment successfully set.")
+            self.log.info("Pilatus angle increment successfully set.")
             return True
 
-        logging.getLogger("HWR").error(
+        self.log.error(
             "Error while setting Pilatus angle increment. Please, check the detector."
         )
         return False

mxcubecore/HardwareObjects/LNLS/LNLSTransmission.py

@@ -18,7 +18,6 @@
 #  You should have received a copy of the GNU General Lesser Public License
 #  along with MXCuBE.  If not, see <http://www.gnu.org/licenses/>.
 
-import logging
 
 from mxcubecore import HardwareRepository as HWR
 from mxcubecore.HardwareObjects.abstract.AbstractTransmission import (
@@ -64,7 +63,7 @@ class LNLSTransmission(EPICSActuator, AbstractTransmission):
             _, actual_transmission, filter_setup = get_transmission(energy_val, value)
             actual_transmission = round(actual_transmission * 100, 2)
 
-            logging.getLogger("HWR").info(
+            self.log.info(
                 "Requested transmission: %s. Closest possible value: %s"
                 % (str(value), str(actual_transmission))
             )
@@ -72,14 +71,12 @@ class LNLSTransmission(EPICSActuator, AbstractTransmission):
             # status 0 is ok, status 1 is failure
             foil_status = set_foils(filter_setup)
         except Exception as e:
-            logging.getLogger("HWR").error(
-                "Error while setting transmission: %s" % str(e)
-            )
+            self.log.error("Error while setting transmission: %s" % str(e))
         else:
             if foil_status == 0:
-                logging.getLogger("HWR").info("Transmission is successfully set!")
+                self.log.info("Transmission is successfully set!")
                 return
-            logging.getLogger("HWR").error(
+            self.log.error(
                 "Error: transmission could not be set (returned status %s)."
                 % foil_status
             )

mxcubecore/HardwareObjects/LdapAuthenticator.py

@@ -4,8 +4,6 @@ This module serves to connect to and Ldap server.
 It works in principle for ESRF, Soleil Proxima and MAXIV beamlines
 """
 
-import logging
-
 import ldap
 
 from mxcubecore.HardwareObjects.abstract.AbstractAuthenticator import (
@@ -42,17 +40,15 @@ class LdapAuthenticator(AbstractAuthenticator):
         domain = self.get_property("ldapdomain")
 
         if ldaphost is None:
-            logging.getLogger("HWR").error(
-                "LdapAuthenticator: you must specify the LDAP hostname"
-            )
+            self.log.error("LdapAuthenticator: you must specify the LDAP hostname")
         else:
             if ldapport is None:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "LdapAuthenticator: connecting to LDAP server %s", ldaphost
                 )
                 self._ldapConnection = ldap.initialize("ldap://" + ldaphost)
             else:
-                logging.getLogger("HWR").debug(
+                self.log.debug(
                     "LdapAuthenticator: connecting to LDAP server %s:%s",
                     ldaphost,
                     ldapport,
@@ -61,7 +57,7 @@ class LdapAuthenticator(AbstractAuthenticator):
                     "ldap://%s:%s" % (ldaphost, int(ldapport))
                 )
 
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "LdapAuthenticator: got connection %s" % str(self._ldapConnection)
             )
 
@@ -73,7 +69,7 @@ class LdapAuthenticator(AbstractAuthenticator):
                 domstr += "%sdc=%s" % (comma, part)
                 comma = ","
             self.domstr = domstr
-            logging.getLogger("HWR").debug(
+            self.log.debug(
                 "LdapAuthenticator: got connection %s" % str(self._ldapConnection)
             )
         else:
@@ -88,12 +84,12 @@ class LdapAuthenticator(AbstractAuthenticator):
                 ldaphost = self.get_property("ldaphost")
                 ldapport = self.get_property("ldapport")
                 if ldapport is None:
-                    logging.getLogger("HWR").debug(
+                    self.log.debug(
                         "LdapAuthenticator: reconnecting to LDAP server %s", ldaphost
                     )
                     self._connect()
                 else:
-                    logging.getLogger("HWR").debug(
+                    self.log.debug(
                         "LdapAuthenticator: reconnecting to LDAP server %s:%s",
                         ldaphost,
                         ldapport,
@@ -109,7 +105,7 @@ class LdapAuthenticator(AbstractAuthenticator):
 
             self._reconnect()
 
-        logging.getLogger("HWR").info("LdapAuthenticator: %s" % msg)
+        self.log.info("LdapAuthenticator: %s" % msg)
 
         return False
 
@@ -129,7 +125,7 @@ class LdapAuthenticator(AbstractAuthenticator):
         if self._ldapConnection is None:
             return self._cleanup(msg="no LDAP server configured")
 
-        logging.getLogger("HWR").debug(
+        self.log.debug(
             "LdapAuthenticator: searching for %s / %s" % (username, self.domstr)
         )
         try:
@@ -158,14 +154,14 @@ class LdapAuthenticator(AbstractAuthenticator):
         if password == "":
             return self._cleanup(msg="invalid password for %s" % username)
 
-        logging.getLogger("HWR").debug("LdapAuthenticator: validating %s" % username)
+        self.log.debug("LdapAuthenticator: validating %s" % username)
 
         try:
             bind_str = "uid=%s, ou=%s, %s" % (username, self.ldapou, self.domstr)
         except AttributeError:
             bind_str = "uid=%s,%s" % (username, self.domstr)
 
-        logging.getLogger("HWR").debug("LdapAuthenticator: binding to %s" % bind_str)
+        self.log.debug("LdapAuthenticator: binding to %s" % bind_str)
         handle = self._ldapConnection.simple_bind(bind_str, password)
 
         try:

mxcubecore/HardwareObjects/Lima2Detector.py

@@ -15,7 +15,7 @@ from mxcubecore.BaseHardwareObjects import HardwareObjectState
 from mxcubecore.CommandContainer import ConnectionError
 from mxcubecore.HardwareObjects.abstract.AbstractDetector import AbstractDetector
 
-_logger = logging.getLogger("HWR")
+_logger = self.log
 
 _logger_det = logging.getLogger("lima2.client.detector")
 _logger_smx = logging.getLogger("lima2.client.smx")

mxcubecore/HardwareObjects/LimaEigerDetector.py

@@ -239,7 +239,7 @@ class LimaEigerDetector(AbstractDetector):
         try:
             self.get_command_object("stop_acq")()
         except Exception:
-            logging.getLogger("HWR").exception("")
+            self.log.exception("")
 
         time.sleep(1)
         self.get_command_object("reset")()

mxcubecore/HardwareObjects/LimaPilatusDetector.py

@@ -1,4 +1,3 @@
-import logging
 import os
 import subprocess
 import time
@@ -112,9 +111,7 @@ class LimaPilatusDetector(AbstractDetector):
 
         except ConnectionError:
             self.update_state(HardwareObjectState.FAULT)
-            logging.getLogger("HWR").error(
-                "Could not connect to detector %s" % lima_device
-            )
+            self.log.error("Could not connect to detector %s" % lima_device)
             self._emit_status()
 
     def has_shutterless(self):

mxcubecore/HardwareObjects/MAXIV/MAXIVAutoProcessing.py

@@ -132,20 +132,18 @@ class MAXIVAutoProcessing(HardwareObject):
                         )
                         will_execute = True
                 if will_execute:
-                    logging.getLogger("HWR").info(
-                        "[MAXIVAutoprocessing] Executing module: %s" % module
-                    )
+                    self.log.info("[MAXIVAutoprocessing] Executing module: %s" % module)
                     try:
                         mod.parse_and_execute()
                     except Exception as ex:
-                        logging.getLogger("HWR").error(
+                        self.log.error(
                             "[MAXIVAutoprocessing] Module %s  execution error." % module
                         )
                         print(module, ex)
 
     def autoproc_done(self, current_autoproc):
         self.current_autoproc_procedure = None
-        logging.getLogger("HWR").info("Autoprocessing executed.")
+        self.log.info("Autoprocessing executed.")
 
     def create_autoproc_input(self, event, params):
         WAIT_XDS_TIMEOUT = 20

mxcubecore/HardwareObjects/MD3UP.py

@@ -1,4 +1,3 @@
-import logging
 import math
 import time
 
@@ -423,4 +422,4 @@ class MD3UP(Microdiff.Microdiff):
             self.centringPhiz.set_value(phiz)
         except Exception:
             msg = "MiniDiff: could not center to beam, aborting"
-            logging.getLogger("HWR").exception(msg)
+            self.log.exception(msg)

mxcubecore/HardwareObjects/MachCurrent.py

@@ -51,7 +51,7 @@ class MachCurrent(AbstractMachineInfo):
             curr.connect_signal("update", self.value_changed)
             self.update_state(self.STATES.READY)
         except Exception as err:
-            logging.getLogger("HWR").exception(err)
+            self.log.exception(err)
 
     def value_changed(self, value):
         """Get information from the control software, emit valueChanged"""
@@ -64,7 +64,7 @@ class MachCurrent(AbstractMachineInfo):
 
             refill = self.get_channel_object("RefillCountdown").get_value()
         except Exception as err:
-            logging.getLogger("HWR").exception(err)
+            self.log.exception(err)
             opmsg, fillmode, value, refill = ("", "", -1, -1)
 
         if opmsg and opmsg != self.opmsg:
@@ -80,19 +80,19 @@ class MachCurrent(AbstractMachineInfo):
         try:
             return self.get_channel_object("Current").get_value()
         except Exception as err:
-            logging.getLogger("HWR").exception(err)
+            self.log.exception(err)
             return -1
 
     def get_message(self) -> str:
         try:
             return self.get_channel_object("OperatorMsg").get_value()
         except Exception as err:
-            logging.getLogger("HWR").exception(err)
+            self.log.exception(err)
             return ""
 
     def get_fill_mode(self) -> str:
         try:
             return self.get_channel_object("FillingMode").get_value()
         except Exception as err:
-            logging.getLogger("HWR").exception(err)
+            self.log.exception(err)
             return ""