aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-14 22:16:24 -0400
committerEugeniy E. Mikhailov <evgmik@gmail.com>2024-07-14 22:16:31 -0400
commit26e5135b1ab7f59922f197ec73ae13ba1e82393b (patch)
tree131b258b3e0461c09351b800abc89732918a8722
parent5f6a6a2e6016787033b93912cfb8113018fa3ebd (diff)
downloadqolab-26e5135b1ab7f59922f197ec73ae13ba1e82393b.tar.gz
qolab-26e5135b1ab7f59922f197ec73ae13ba1e82393b.zip
format with newer version of black
-rw-r--r--examples/Bfield_driver.py6
-rw-r--r--examples/eit_with_vcsel.py6
-rw-r--r--qolab/__init__.py1
-rw-r--r--qolab/hardware/multimeter/__init__.py6
-rw-r--r--qolab/hardware/power_supply/__init__.py6
-rw-r--r--qolab/hardware/scope/__init__.py1
6 files changed, 14 insertions, 12 deletions
diff --git a/examples/Bfield_driver.py b/examples/Bfield_driver.py
index 27e3405..e987ce9 100644
--- a/examples/Bfield_driver.py
+++ b/examples/Bfield_driver.py
@@ -21,9 +21,9 @@ class BfieldDriver(KeysightE3612A):
def __init__(self, *args, **kwds):
super().__init__(*args, **kwds)
- self.config[
- "Device type"
- ] = "B field coil driver based on Keysight E3612A power supply"
+ self.config["Device type"] = (
+ "B field coil driver based on Keysight E3612A power supply"
+ )
self.config["Device model"] = "v0.1"
self.deviceProperties = self.deviceProperties.union(
{"B", "Bslope_TperA", "CoilAssignment"}
diff --git a/examples/eit_with_vcsel.py b/examples/eit_with_vcsel.py
index 3263387..b9176f1 100644
--- a/examples/eit_with_vcsel.py
+++ b/examples/eit_with_vcsel.py
@@ -50,9 +50,9 @@ class BfieldDriver(KeysightE3612A):
def __init__(self, *args, **kwds):
super().__init__(*args, **kwds)
- self.config[
- "Device type"
- ] = "B field coil driver based on Keysight E3612A power supply"
+ self.config["Device type"] = (
+ "B field coil driver based on Keysight E3612A power supply"
+ )
self.config["Device model"] = "v0.1"
self.deviceProperties.update({"B", "Bslope_TperA", "CoilAssignment"})
""""
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