Merge pull request #307 from lnls-sirius/conform-to-pylint

Conform to Pylint

as-ap-currinfo/as_ap_currinfo/as_ap_currinfo.py

@@ -1,27 +1,28 @@
 """CurrInfo Soft IOC."""
 
+import logging as _log
 import os as _os
-import sys as _sys
 import signal as _signal
-import logging as _log
+import sys as _sys
 
 import pcaspy as _pcaspy
 import pcaspy.tools as _pcaspy_tools
-
 from siriuspy import util as _util
-from siriuspy.envars import VACA_PREFIX as _vaca_prefix
 from siriuspy.currinfo import BOCurrInfoApp as _BOCurrInfoApp, \
-    SICurrInfoApp as _SICurrInfoApp, LICurrInfoApp as _LICurrInfoApp, \
+    LICurrInfoApp as _LICurrInfoApp, SICurrInfoApp as _SICurrInfoApp, \
     TSCurrInfoApp as _TSCurrInfoApp
-
+from siriuspy.envars import VACA_PREFIX as _VACA_PREFIX
 
 INTERVAL = 0.5
 STOP_EVENT = False
 
 
 def _stop_now(signum, frame):
     _ = frame
-    print(_signal.Signals(signum).name+' received at '+_util.get_timestamp())
+    sname = _signal.Signals(signum).name
+    tstamp = _util.get_timestamp()
+    strf = f'{sname} received at {tstamp}'
+    _log.warning(strf)
     _sys.stdout.flush()
     _sys.stderr.flush()
     global STOP_EVENT
@@ -96,7 +97,7 @@ def run(acc):
 
     # define IOC, init pvs database and create app object
     _version = _util.get_last_commit_hash()
-    _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '')
+    _ioc_prefix = _VACA_PREFIX + ('-' if _VACA_PREFIX else '')
     if acc == 'BO':
         _ioc_prefix += acc + '-Glob:AP-CurrInfo:'
     _log.debug('Creating App Object.')

as-ap-currinfo/as_ap_currinfo/lifetime/lifetime.py

@@ -1,26 +1,26 @@
 """CurrInfo Lifetime Soft IOC."""
 
+import logging as _log
 import os as _os
-import sys as _sys
 import signal as _signal
-import logging as _log
+import sys as _sys
 
 import pcaspy as _pcaspy
 import pcaspy.tools as _pcaspy_tools
-
 from siriuspy import util as _util
-from siriuspy.envars import VACA_PREFIX as _vaca_prefix
-
 from siriuspy.currinfo import SILifetimeApp as _SILifetimeApp
-
+from siriuspy.envars import VACA_PREFIX as _VACA_PREFIX
 
 INTERVAL = 0.1
 STOP_EVENT = False
 
 
 def _stop_now(signum, frame):
     _ = frame
-    print(_signal.Signals(signum).name+' received at '+_util.get_timestamp())
+    sname = _signal.Signals(signum).name
+    tstamp = _util.get_timestamp()
+    strf = f'{sname} received at {tstamp}'
+    _log.warning(strf)
     _sys.stdout.flush()
     _sys.stderr.flush()
     global STOP_EVENT
@@ -78,7 +78,7 @@ def run():
 
     # define IOC, init pvs database and create app object
     _version = _util.get_last_commit_hash()
-    _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '')
+    _ioc_prefix = _VACA_PREFIX + ('-' if _VACA_PREFIX else '')
     _ioc_prefix += 'SI-Glob:AP-CurrInfo:'
     app = _SILifetimeApp()
     dbase = app.pvs_database

as-ap-currinfo/scripts/sirius-ioc-bo-ap-currinfo.py

@@ -2,4 +2,5 @@
 """BO-AP-CurrentInfo IOC executable."""
 
 from as_ap_currinfo import as_ap_currinfo as ioc_module
+
 ioc_module.run('bo')

as-ap-currinfo/scripts/sirius-ioc-li-ap-currinfo.py

@@ -2,4 +2,5 @@
 """LI-AP-CurrentInfo IOC executable."""
 
 from as_ap_currinfo import as_ap_currinfo as ioc_module
+
 ioc_module.run('li')

as-ap-currinfo/scripts/sirius-ioc-si-ap-currinfo-lifetime.py

@@ -2,4 +2,5 @@
 """SI-AP-CurrentInfo-Lifetime IOC executable."""
 
 from as_ap_currinfo.lifetime import lifetime as ioc_module
+
 ioc_module.run()

as-ap-currinfo/scripts/sirius-ioc-si-ap-currinfo.py

@@ -2,4 +2,5 @@
 """SI-AP-CurrentInfo IOC executable."""
 
 from as_ap_currinfo import as_ap_currinfo as ioc_module
+
 ioc_module.run('si')

as-ap-currinfo/scripts/sirius-ioc-ts-ap-currinfo.py

@@ -2,4 +2,5 @@
 """TS-AP-CurrentInfo IOC executable."""
 
 from as_ap_currinfo import as_ap_currinfo as ioc_module
+
 ioc_module.run('ts')

as-ap-injctrl/as_ap_injctrl/as_ap_injctrl.py

@@ -1,15 +1,14 @@
 """AS-AP-InjCtrl Soft IOC."""
 
+import logging as _log
 import os as _os
-import sys as _sys
 import signal as _signal
+import sys as _sys
 
 import pcaspy as _pcaspy
 import pcaspy.tools as _pcaspy_tools
-
 from siriuspy import util as _util
-from siriuspy.envars import VACA_PREFIX as _vaca_prefix
-
+from siriuspy.envars import VACA_PREFIX as _VACA_PREFIX
 from siriuspy.injctrl.main import App as _App
 
 INTERVAL = 0.1
@@ -18,7 +17,10 @@
 
 def _stop_now(signum, frame):
     _ = frame
-    print(_signal.Signals(signum).name+' received at '+_util.get_timestamp())
+    sname = _signal.Signals(signum).name
+    tstamp = _util.get_timestamp()
+    strf = f'{sname} received at {tstamp}'
+    _log.warning(strf)
     _sys.stdout.flush()
     _sys.stderr.flush()
     global STOP_EVENT
@@ -58,6 +60,7 @@ def write(self, reason, value):
 
     def update_pv(self, pvname, value, **kwargs):
         """Update PV."""
+        _ = kwargs
         self.setParam(pvname, value)
         self.updatePV(pvname)
 
@@ -73,7 +76,7 @@ def run():
 
     # define IOC, init pvs database and create app object
     _version = _util.get_last_commit_hash()
-    _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '')
+    _ioc_prefix = _VACA_PREFIX + ('-' if _VACA_PREFIX else '')
     _ioc_prefix += 'AS-Glob:AP-InjCtrl:'
     app = _App()
     dbase = app.pvs_database

as-ap-injctrl/scripts/sirius-ioc-as-ap-injctrl.py

@@ -2,4 +2,5 @@
 """Injection Control IOC executable."""
 
 from as_ap_injctrl import as_ap_injctrl as ioc_module
+
 ioc_module.run()

as-ap-machshift/as_ap_machshift/as_ap_machshift.py

@@ -1,14 +1,14 @@
 """AS-AP-MachShift Soft IOC."""
 
+import logging as _log
 import os as _os
-import sys as _sys
 import signal as _signal
+import sys as _sys
+
 import pcaspy as _pcaspy
 import pcaspy.tools as _pcaspy_tools
-
 from siriuspy import util as _util
-from siriuspy.envars import VACA_PREFIX as _vaca_prefix
-
+from siriuspy.envars import VACA_PREFIX as _VACA_PREFIX
 from siriuspy.machshift.main import App as _App
 
 INTERVAL = 0.1
@@ -17,7 +17,10 @@
 
 def _stop_now(signum, frame):
     _ = frame
-    print(_signal.Signals(signum).name+' received at '+_util.get_timestamp())
+    sname = _signal.Signals(signum).name
+    tstamp = _util.get_timestamp()
+    strf = f'{sname} received at {tstamp}'
+    _log.warning(strf)
     _sys.stdout.flush()
     _sys.stderr.flush()
     global STOP_EVENT
@@ -54,6 +57,7 @@ def write(self, reason, value):
 
     def update_pv(self, pvname, value, **kwargs):
         """Update PV."""
+        _ = kwargs
         self.setParam(pvname, value)
         self.updatePV(pvname)
 
@@ -69,7 +73,7 @@ def run():
 
     # define IOC, init pvs database and create app object
     _version = _util.get_last_commit_hash()
-    _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '')
+    _ioc_prefix = _VACA_PREFIX + ('-' if _VACA_PREFIX else '')
     _ioc_prefix += 'AS-Glob:AP-MachShift:'
     app = _App()
     dbase = app.pvs_database

as-ap-machshift/scripts/sirius-ioc-as-ap-machshift.py

@@ -2,4 +2,5 @@
 """Machine Shift IOC executable."""
 
 from as_ap_machshift import as_ap_machshift as ioc_module
+
 ioc_module.run()

as-ap-opmode/as_ap_opmode/driver.py

@@ -1,18 +1,23 @@
+"""PCAS Driver class."""
 
 import pcaspy
 import pvs
 
 
 class PCASDriver(pcaspy.Driver):
+    """."""
 
     def __init__(self):
+        """."""
         super().__init__()
         self._initialise_pvs()
 
     def read(self, reason):
+        """."""
         return super().read(reason)
 
     def write(self, reason, value):
+        """."""
         return super().write(reason, value)
 
     def _initialise_pvs(self):

as-ap-opmode/as_ap_opmode/pvs.py

@@ -1,7 +1,7 @@
+"""PVs DB."""
 
 from pcaspy import Severity
 
-
 pvdb = {
     'SHIFT-TYPE': {
         'type': 'enum',

as-ap-opmode/as_ap_opmode/run.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python-sirius
+"""Run script."""
 
 import server
 
-
 server.run()

as-ap-opmode/as_ap_opmode/server.py

@@ -1,17 +1,18 @@
 
+import driver
 import pcaspy
 import pvs
-import driver
-
 
 PREFIX = 'SIPA-'
 INTERVAL = 0.1
 
 
 def run():
+    """."""
     server = pcaspy.SimpleServer()
     server.createPV(PREFIX, pvs.pvdb)
     pcas_driver = driver.PCASDriver()
+    _ = pcas_driver
 
     while True:
         server.process(INTERVAL)

as-ap-opticscorr/as_ap_opticscorr/chrom/chrom.py

@@ -1,24 +1,26 @@
 """AS-AP-OpticsCorr-Chrom IOC."""
 
+import logging as _log
 import os as _os
-import sys as _sys
 import signal as _signal
+import sys as _sys
+
 import pcaspy as _pcaspy
 import pcaspy.tools as _pcaspy_tools
-
 from siriuspy import util as _util
-from siriuspy.envars import VACA_PREFIX as _vaca_prefix
-
+from siriuspy.envars import VACA_PREFIX as _VACA_PREFIX
 from siriuspy.opticscorr.chrom import ChromCorrApp as _App
 
-
 INTERVAL = 0.25
 STOP_EVENT = False
 
 
 def _stop_now(signum, frame):
     _ = frame
-    print(_signal.Signals(signum).name+' received at '+_util.get_timestamp())
+    sname = _signal.Signals(signum).name
+    tstamp = _util.get_timestamp()
+    strf = f'{sname} received at {tstamp}'
+    _log.warning(strf)
     _sys.stdout.flush()
     _sys.stderr.flush()
     global STOP_EVENT
@@ -72,7 +74,7 @@ def run(acc):
 
     # define IOC, init pvs database and create app object
     _version = _util.get_last_commit_hash()
-    _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '')
+    _ioc_prefix = _VACA_PREFIX + ('-' if _VACA_PREFIX else '')
     _ioc_prefix += acc.upper() + '-Glob:AP-ChromCorr:'
     app = _App(acc)
     dbase = app.pvs_database

as-ap-opticscorr/as_ap_opticscorr/tune/tune.py

@@ -1,24 +1,26 @@
 """AS-AP-OpticsCorr-Tune IOC."""
 
+import logging as _log
 import os as _os
-import sys as _sys
 import signal as _signal
+import sys as _sys
+
 import pcaspy as _pcaspy
 import pcaspy.tools as _pcaspy_tools
-
 from siriuspy import util as _util
-from siriuspy.envars import VACA_PREFIX as _vaca_prefix
-
+from siriuspy.envars import VACA_PREFIX as _VACA_PREFIX
 from siriuspy.opticscorr.tune import TuneCorrApp as _App
 
-
 INTERVAL = 0.1
 STOP_EVENT = False
 
 
 def _stop_now(signum, frame):
     _ = frame
-    print(_signal.Signals(signum).name+' received at '+_util.get_timestamp())
+    sname = _signal.Signals(signum).name
+    tstamp = _util.get_timestamp()
+    strf = f'{sname} received at {tstamp}'
+    _log.warning(strf)
     _sys.stdout.flush()
     _sys.stderr.flush()
     global STOP_EVENT
@@ -53,6 +55,7 @@ def write(self, reason, value):
 
     def update_pv(self, pvname, value, **kwargs):
         """Update PV."""
+        _ = kwargs
         self.setParam(pvname, value)
         self.updatePV(pvname)
 
@@ -68,7 +71,7 @@ def run(acc):
 
     # define IOC, init pvs database and create app object
     _version = _util.get_last_commit_hash()
-    _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '')
+    _ioc_prefix = _VACA_PREFIX + ('-' if _VACA_PREFIX else '')
     _ioc_prefix += acc.upper() + '-Glob:AP-TuneCorr:'
     app = _App(acc)
     dbase = app.pvs_database

as-ap-opticscorr/scripts/sirius-ioc-bo-ap-chromcorr.py

@@ -2,4 +2,5 @@
 """BO AP Chromaticity Correction IOC executable."""
 
 from as_ap_opticscorr.chrom import chrom as ioc_module
+
 ioc_module.run('bo')

as-ap-opticscorr/scripts/sirius-ioc-bo-ap-tunecorr.py

@@ -2,4 +2,5 @@
 """BO AP Tune Correction IOC executable."""
 
 from as_ap_opticscorr.tune import tune as ioc_module
+
 ioc_module.run('bo')

as-ap-opticscorr/scripts/sirius-ioc-si-ap-chromcorr.py

@@ -2,4 +2,5 @@
 """SI AP Chromaticity Correction IOC executable."""
 
 from as_ap_opticscorr.chrom import chrom as ioc_module
+
 ioc_module.run('si')