diff options
| -rw-r--r-- | qolab/data/__init__.py | 1 | ||||
| -rw-r--r-- | qolab/hardware/lockin/__init__.py | 1 | ||||
| -rw-r--r-- | qolab/hardware/multimeter/__init__.py | 1 | ||||
| -rw-r--r-- | qolab/hardware/power_supply/keysight_e3612a.py | 2 | ||||
| -rw-r--r-- | qolab/tsdb/__init__.py | 1 |
5 files changed, 4 insertions, 2 deletions
diff --git a/qolab/data/__init__.py b/qolab/data/__init__.py index c0f071c..721a328 100644 --- a/qolab/data/__init__.py +++ b/qolab/data/__init__.py @@ -1,4 +1,3 @@ - from .trace import Trace, TraceXY, TraceSetSameX __all__ = [ diff --git a/qolab/hardware/lockin/__init__.py b/qolab/hardware/lockin/__init__.py index 5190d69..c82571f 100644 --- a/qolab/hardware/lockin/__init__.py +++ b/qolab/hardware/lockin/__init__.py @@ -6,6 +6,7 @@ class Lockin(BasicInstrument): """Basic lockin class with. Intended to be expanded in hardware specific classes. """ + def __init__(self, *args, **kwds): BasicInstrument.__init__(self, *args, **kwds) self.config["Device type"] = "Lockin" diff --git a/qolab/hardware/multimeter/__init__.py b/qolab/hardware/multimeter/__init__.py index a55a933..3fecc10 100644 --- a/qolab/hardware/multimeter/__init__.py +++ b/qolab/hardware/multimeter/__init__.py @@ -8,6 +8,7 @@ class Multimeter(BasicInstrument): Intended to be part of the hardware aware class. """ + def __init__(self, *args, **kwds): BasicInstrument.__init__(self, *args, **kwds) self.config["Device type"] = "Multimeter" diff --git a/qolab/hardware/power_supply/keysight_e3612a.py b/qolab/hardware/power_supply/keysight_e3612a.py index 69f6f4a..f843795 100644 --- a/qolab/hardware/power_supply/keysight_e3612a.py +++ b/qolab/hardware/power_supply/keysight_e3612a.py @@ -46,7 +46,7 @@ class KeysightE3612A(PowerSupplySCPI): return 0.160e-3 # see specification for high current > 20mA def getOpMode(self): - """ Queries power supply operation mode, returns OFF|PAR|SER|TRAC. + """Queries power supply operation mode, returns OFF|PAR|SER|TRAC. OFF stands for independent channels """ diff --git a/qolab/tsdb/__init__.py b/qolab/tsdb/__init__.py index e842137..84bc060 100644 --- a/qolab/tsdb/__init__.py +++ b/qolab/tsdb/__init__.py @@ -86,6 +86,7 @@ def tsdb_append_metric_for_class_setter_or_getter(tsdb_logger=None): Intended to be used as decorator for setters and getters, i.e. it expect the wrapped function to be something like getXXX or setXXX. """ + def wrap(f): @functools.wraps(f) def wrapper(*args, **kwds): |