ENH: use logger

SiLab-Bonn · Aug 16, 2019 · 3de9d0b · 3de9d0b
1 parent 14d977a
commit 3de9d0b
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/basil/HL/GPAC.py b/basil/HL/GPAC.py
@@ -15,6 +15,7 @@
 from basil.HL.HardwareLayer import HardwareLayer
 from basil.HL.FEI4AdapterCard import Eeprom24Lc128
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -101,12 +102,12 @@ def __init__(self, intf, conf):
     def init(self):
         self._intf.write(self._base_addr + self.PCA9554_ADD, (self.PCA9554_CFG, self.GPIO_CFG))
         if self._init['no_power_reset'] is False:
-            logging.info("########GPAC            ##########")
-            logging.info("########POWER RESET!!!!!##########")
+            logger.info("########GPAC            ##########")
+            logger.info("########POWER RESET!!!!!##########")
             self._intf.write(self._base_addr + self.PCA9554_ADD, (self.PCA9554_OUT, 0x00))
         else:
-            logging.info("########GPAC                 #####")
-            logging.info("########SKIPPING POWER RESET #####")
+            logger.info("########GPAC                 #####")
+            logger.info("########SKIPPING POWER RESET #####")
 
 
 class AdcMuxGpio(GpioPca9554):

diff --git a/basil/HL/debyeflex3003.py b/basil/HL/debyeflex3003.py
@@ -5,9 +5,13 @@
 # ------------------------------------------------------------
 #
 
-from basil.HL.RegisterHardwareLayer import HardwareLayer
 import logging
 
+from basil.HL.RegisterHardwareLayer import HardwareLayer
+
+
+logger = logging.getLogger(__name__)
+
 
 class debyeflex3003(HardwareLayer):
 
@@ -24,7 +28,7 @@ def init(self):
     def read(self):
         ret = self._intf.read()
         if ret[-1:] != "\r":
-            print("debyeflex3003.read() termination error")
+            logger.warning("debyeflex3003.read() termination error")
         return ret[1:-1]
 
     def write(self, cmd):
@@ -51,7 +55,7 @@ def set_current(self, curr):
             raise ValueError("Illegal value for tube current (0 - 80 mA)")
         else:
             self.write("SC:{:02d}".format(int(curr)))
-            logging.info("Set tube current to {:.1f} mA".format(self.get_nominal_current()))
+            logger.info("Set tube current to {:.1f} mA".format(self.get_nominal_current()))
 
     def get_nominal_voltage(self):
         """Read nominal voltage in kV.
@@ -74,7 +78,7 @@ def set_voltage(self, vol):
             raise ValueError("Illegal value for tube voltage (0 - 60 kV)")
         else:
             self.write("SV:{:02d}".format(vol))
-            logging.info("Set tube voltage to {:.1f} kV".format(self.get_nominal_voltage()))
+            logger.info("Set tube voltage to {:.1f} kV".format(self.get_nominal_voltage()))
 
     def set_highvoltage_on(self):
         self.write("HV:1")
@@ -91,7 +95,7 @@ def open_shutter(self, shutter=1):
             raise ValueError("Invalid value for shutter number")
         else:
             self.write("OS:{:1d}".format(shutter))
-            logging.info("Opened shutter number {:1d}".format(shutter))
+            logger.info("Opened shutter number {:1d}".format(shutter))
 
     def close_shutter(self, shutter=1):
         """Close the shutter with given number. Only shuttter=1 supported from hardware currently
@@ -102,7 +106,7 @@ def close_shutter(self, shutter=1):
             raise ValueError("Invalid value for shutter number")
         else:
             self.write("CS:{:1d}".format(shutter))
-            logging.info("Closed shutter number {:1d}".format(shutter))
+            logger.info("Closed shutter number {:1d}".format(shutter))
 
     def activate_timer(self, shutter=1):
         """Activate the timer for a given shutter number
@@ -113,7 +117,7 @@ def activate_timer(self, shutter=1):
             raise ValueError("Invalid value for shutter number")
         else:
             self.write("TS:{:1d}".format(shutter))
-            logging.info("Started timer number {:1d}".format(shutter))
+            logger.info("Started timer number {:1d}".format(shutter))
 
     def deactivate_timer(self, shutter=1):
         """Deactivate the timer for a given shutter number
@@ -124,7 +128,7 @@ def deactivate_timer(self, shutter=1):
             raise ValueError("Invalid value for shutter number")
         else:
             self.write("TE:{:1d}".format(shutter))
-            logging.info("Stopped timer number {:1d}".format(shutter))
+            logger.info("Stopped timer number {:1d}".format(shutter))
 
     def set_timer(self, timer=1, dur=3600):
         """Set the timer with the given number (corresponds to shutter number) to the given duration (in s)
@@ -141,7 +145,7 @@ def set_timer(self, timer=1, dur=3600):
             s = (dur % 3600) % 60
             self.write("TP:{:1d},{:02d},{:02d},{:02d}".format(timer, h, m, s))
             time = self.get_nominal_time(timer)
-            logging.info("Set timer number {:1d} to {:02d}:{:02d}:{:02d} (HH:MM:SS)".format(
+            logger.info("Set timer number {:1d} to {:02d}:{:02d}:{:02d} (HH:MM:SS)".format(
                 timer, time // 3600, (time % 3600) // 60, (time % 3600) % 60)
             )
 
@@ -183,5 +187,5 @@ def get_status(self, status_word):
         self.write("SR:{:02d}".format(status_word))
         response = self.read()
         status = bin(int(response[7:10]))[2:].zfill(8)  # Convert response to 8 char long string of binary values
-        logging.info("Status word {:02d}: {:8s}".format(status_word, status))
+        logger.info("Status word {:02d}: {:8s}".format(status_word, status))
         return status
diff --git a/basil/HL/julaboF32HD.py b/basil/HL/julaboF32HD.py
@@ -11,6 +11,9 @@
 from basil.HL.RegisterHardwareLayer import HardwareLayer
 
 
+logger = logging.getLogger(__name__)
+
+
 class julaboF32HD(HardwareLayer):
     ''' Driver for the Julabo F32-HD chiller.
     A simple protocol via RS 232 serial port is used with 4800 baud rate.
@@ -26,7 +29,7 @@ def init(self):
     def read(self):
         ret = self._intf.read()
         if len(ret) < 2 or ret[-2:] != "\r\n":
-            logging.warning("read() termination error")
+            logger.warning("read() termination error")
         return ret[:-2]
 
     def write(self, cmd):
@@ -60,13 +63,13 @@ def get_status(self):
         '''
         self.write("status")
         ret = self.read()
-        logging.debug("status:{:s}".format(ret))
+        logger.debug("status:{:s}".format(ret))
         try:
             tmp = ret.split(" ", 1)
             status = int(tmp[0])
             status_str = tmp[1:]
         except (ValueError, AttributeError):
-            logging.warning("get_status() wrong format: {}".format(repr(ret)))
+            logger.warning("get_status() wrong format: {}".format(repr(ret)))
             status = -99
             status_str = ret
         return status, status_str
diff --git a/basil/HL/tti_ql355tp.py b/basil/HL/tti_ql355tp.py
@@ -5,12 +5,15 @@
 # ------------------------------------------------------------
 #
 
-
+import logging
 import time
 
 from basil.HL.RegisterHardwareLayer import HardwareLayer
 
 
+logger = logging.getLogger(__name__)
+
+
 class ttiQl355tp(HardwareLayer):
     ''' HL for the TTi QL355TP.
     '''
@@ -35,7 +38,7 @@ def ask(self, command):
     def read(self):
         ret = self._intf.read()
         if ret[-2:] != "\r\n":
-            print("ttiTp355tp.read() termination error")
+            logger.warning("ttiTp355tp.read() termination error")
         return ret[:-2]
 
     def set_enable(self, on, channel=1):
@@ -53,31 +56,31 @@ def get_current(self, channel):
         """ channel: 1=OP1, 2=OP2, AUX is not supported"""
         ret = self.ask("I%dO?" % channel)
         if ret[-1] != "A":
-            print("ttiQl355tp.get_current() format error: %s" % ret)
+            logger.warning("ttiQl355tp.get_current() format error: %s" % ret)
             return None
         return float(ret[:-1])
 
     def get_voltage(self, channel):
         """ channel: 1=OP1, 2=OP2, AUX is not supported"""
         ret = self.ask("V%dO?" % channel)
         if ret[-1] != "V":
-            print("ttiQl355tp.get_voltage() format error: %s" % ret)
+            logger.warning("ttiQl355tp.get_voltage() format error: %s" % ret)
             return None
         return float(ret[:-1])
 
     def get_set_voltage(self, channel):
         """ channel: 1=OP1, 2=OP2, AUX is not supported"""
         ret = self.ask("V%d?" % channel)
         if ret[:3] != "V%d " % channel:
-            print("ttiQl355tp.get_voltage() format error: %s" % ret)
+            logger.warning("ttiQl355tp.get_voltage() format error: %s" % ret)
             return None
         return float(ret[3:])
 
     def get_current_limit(self, channel):
         """ channel: 1=OP1, 2=OP2, AUX is not supported"""
         ret = self.ask("I%d?" % channel)
         if ret[:3] != "I%d " % channel:
-            print("ttiQl355tp.get_current_limit() format error: %s" % ret)
+            logger.warning("ttiQl355tp.get_current_limit() format error: %s" % ret)
             return None
         return float(ret[3:])