diff options
Diffstat (limited to 'qolab')
-rw-r--r-- | qolab/__init__.py | 1 | ||||
-rw-r--r-- | qolab/hardware/multimeter/__init__.py | 6 | ||||
-rw-r--r-- | qolab/hardware/power_supply/__init__.py | 6 | ||||
-rw-r--r-- | qolab/hardware/scope/__init__.py | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/qolab/__init__.py b/qolab/__init__.py index 2a4e1f6..893a1c9 100644 --- a/qolab/__init__.py +++ b/qolab/__init__.py @@ -1,2 +1,3 @@ """ Classes and functions useful for the quantum optics lab: qolab """ + __version__ = "0.16" diff --git a/qolab/hardware/multimeter/__init__.py b/qolab/hardware/multimeter/__init__.py index 3fecc10..20fd1e6 100644 --- a/qolab/hardware/multimeter/__init__.py +++ b/qolab/hardware/multimeter/__init__.py @@ -12,9 +12,9 @@ class Multimeter(BasicInstrument): def __init__(self, *args, **kwds): BasicInstrument.__init__(self, *args, **kwds) self.config["Device type"] = "Multimeter" - self.config[ - "Device model" - ] = "Generic Multimeter generator Without Hardware interface" + self.config["Device model"] = ( + "Generic Multimeter generator Without Hardware interface" + ) self.config["FnamePrefix"] = "Multimeter" self.config["Device model"] = "Generic Multimeter Without Hardware interface" self.config["FnamePrefix"] = "multimeter" diff --git a/qolab/hardware/power_supply/__init__.py b/qolab/hardware/power_supply/__init__.py index 13b36b4..6635584 100644 --- a/qolab/hardware/power_supply/__init__.py +++ b/qolab/hardware/power_supply/__init__.py @@ -13,9 +13,9 @@ class PowerSupply(BasicInstrument): def __init__(self, *args, **kwds): BasicInstrument.__init__(self, *args, **kwds) self.config["Device type"] = "PowerSupply" - self.config[ - "Device model" - ] = "Generic Power Supply generator Without Hardware interface" + self.config["Device model"] = ( + "Generic Power Supply generator Without Hardware interface" + ) self.config["FnamePrefix"] = "power_supply" self.deviceProperties.update({}) diff --git a/qolab/hardware/scope/__init__.py b/qolab/hardware/scope/__init__.py index f9af068..2fe35da 100644 --- a/qolab/hardware/scope/__init__.py +++ b/qolab/hardware/scope/__init__.py @@ -3,6 +3,7 @@ Provide basic class to operate scope Created by Eugeniy E. Mikhailov 2021/11/29 """ + from qolab.hardware.scpi import SCPIinstr from qolab.hardware.basic import BasicInstrument from qolab.data.trace import TraceSetSameX |