Merge pull request #210 from BCDA-APS/209-superclass-init

`devices` call to superclass `__init__()`

Author: prjemian

CHANGES.rst

@@ -6,6 +6,8 @@ Change History
 
 :1.1.10:  release *tba* : updates & bug fix
 
+    * `#209 <https://github.com/BCDA-APS/apstools/issues/209>`_
+       ``devices`` call to superclass ``__init__()``
     * `#207 <https://github.com/BCDA-APS/apstools/issues/207>`_
        ``show_ophyd_symbols`` also shows labels
     * `#206 <https://github.com/BCDA-APS/apstools/issues/206>`_

apstools/devices.py

@@ -1583,7 +1583,7 @@ def AD_warmed_up(detector):
     return verdict
 
 
-class AD_EpicsHdf5FileName(FileStorePluginBase):
+class AD_EpicsHdf5FileName(FileStorePluginBase):    # lgtm [py/missing-call-to-init]
     """
     custom class to define image file name from EPICS
     
@@ -1687,7 +1687,7 @@ class MySimDetector(SingleTrigger, SimDetector):
     """
 
     def __init__(self, *args, **kwargs):
-        FileStorePluginBase.__init__(*args, **kwargs)
+        FileStorePluginBase.__init__(self, *args, **kwargs)
         self.filestore_spec = 'AD_HDF5'  # spec name stored in resource doc
         self.stage_sigs.update([
             ('file_template', '%s%s_%4.4d.h5'),

apstools/signals.py

@@ -26,7 +26,7 @@
 logger = logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 
-class SynPseudoVoigt(ophyd.sim.SynSignal):
+class SynPseudoVoigt(ophyd.sim.SynSignal):    # lgtm [py/missing-call-to-init]
     """
     Evaluate a point on a pseudo-Voigt based on the value of a motor.
     

apstools/utils.py

@@ -223,17 +223,16 @@ def list_recent_scans(num=20, keys=[], printing=True, db=None):
         global_db = None
     db = db or global_db
 
-    keys.insert(0, "plan_name")
-    keys.insert(0, "scan_id")
+    labels = "scan_id  plan_name".split() + keys
 
     table = pyRestTable.Table()
-    table.labels = "short_uid   date/time".split() + keys
+    table.labels = "short_uid   date/time".split() + labels
 
     for h in db[-abs(num):]:
         row = [
             h.start["uid"][:7],
             datetime.datetime.fromtimestamp(h.start['time']),
-            ] + [h.start.get(k, "") for k in keys]
+            ] + [h.start.get(k, "") for k in labels]
         table.addRow(row)
 
     if printing: