diff --git a/src/openqlab/io/importers/__init__.py b/src/openqlab/io/importers/__init__.py index 2908b4412bfc8174e0ab2894817d88bdb029b823..c3ac800dd82c9e0aae973cc442487b2b5da37536 100644 --- a/src/openqlab/io/importers/__init__.py +++ b/src/openqlab/io/importers/__init__.py @@ -3,19 +3,19 @@ import glob import importlib import inspect -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import BaseImporter -from OpenQlab.io.importers.ascii import ASCII -from OpenQlab.io.importers.data_container_csv import DataContainerCSV -from OpenQlab.io.importers.hp4395a import HP4395A -#from OpenQlab.io.importers.hp4395a_gpib import HP4395A_GPIB -from OpenQlab.io.importers.keysight_binary import KeysightBinary -from OpenQlab.io.importers.keysight_csv import KeysightCSV -from OpenQlab.io.importers.keysight_fra import KeysightFRA -from OpenQlab.io.importers.rhode_schwarz import RhodeSchwarz -from OpenQlab.io.importers.tektronix import Tektronix -from OpenQlab.io.importers.tektronix_dpx import TektronixDPX -from OpenQlab.io.importers.tektronix_spectrogram import TektronixSpectrogram +from openqlab.io.importers import utils +from openqlab.io.base_importer import BaseImporter +from openqlab.io.importers.ascii import ASCII +from openqlab.io.importers.data_container_csv import DataContainerCSV +from openqlab.io.importers.hp4395a import HP4395A +#from openqlab.io.importers.hp4395a_gpib import HP4395A_GPIB +from openqlab.io.importers.keysight_binary import KeysightBinary +from openqlab.io.importers.keysight_csv import KeysightCSV +from openqlab.io.importers.keysight_fra import KeysightFRA +from openqlab.io.importers.rhode_schwarz import RhodeSchwarz +from openqlab.io.importers.tektronix import Tektronix +from openqlab.io.importers.tektronix_dpx import TektronixDPX +from openqlab.io.importers.tektronix_spectrogram import TektronixSpectrogram @@ -29,7 +29,7 @@ for fn in glob.glob(IMPORTER_DIR + "/*.py"): if importer in ('__init__', 'utils'): continue try: - importer_module = importlib.import_module('OpenQlab.io.importers.' + importer, package='OpenQlab.io.importers') + importer_module = importlib.import_module('openqlab.io.importers.' + importer, package='openqlab.io.importers') for m in inspect.getmembers(importer_module, inspect.isclass): name, klass = m if issubclass(klass, BaseImporter): diff --git a/src/openqlab/io/importers/ascii.py b/src/openqlab/io/importers/ascii.py index 63a599403e2ac6c1b5f1d5bcf62c02748ecf28f2..eef51e004371b09352cc0c0b6116302e99fd0839 100644 --- a/src/openqlab/io/importers/ascii.py +++ b/src/openqlab/io/importers/ascii.py @@ -1,8 +1,8 @@ from typing import List import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer class ASCII(StreamImporter): diff --git a/src/openqlab/io/importers/ascii_header.py b/src/openqlab/io/importers/ascii_header.py index a1585c05dae40568cbfa6ff1331a4ae954e42bc9..cbc8717e0d4fc7aec0c3197b916e6bf4cb20ba2c 100644 --- a/src/openqlab/io/importers/ascii_header.py +++ b/src/openqlab/io/importers/ascii_header.py @@ -1,8 +1,8 @@ from typing import List import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer import re from pathlib import Path diff --git a/src/openqlab/io/importers/data_container_csv.py b/src/openqlab/io/importers/data_container_csv.py index b220fc11a1f2e996abba9c4640069067c0e7ca3a..4b4f6f5d3af18272f5352110aa0603d1b4970c75 100644 --- a/src/openqlab/io/importers/data_container_csv.py +++ b/src/openqlab/io/importers/data_container_csv.py @@ -1,6 +1,6 @@ -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer -from OpenQlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer +from openqlab.io.importers import utils class DataContainerCSV(StreamImporter): diff --git a/src/openqlab/io/importers/gwinstek.py b/src/openqlab/io/importers/gwinstek.py index ee67cf58df029b48e48b46943256330eec59ab13..c40dc6eb13d80272d076bb9ae207677107b7ebb5 100644 --- a/src/openqlab/io/importers/gwinstek.py +++ b/src/openqlab/io/importers/gwinstek.py @@ -1,9 +1,9 @@ import numpy as np import pandas as pd -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer from typing import Callable, cast -from OpenQlab.io.importers import utils +from openqlab.io.importers import utils from pathlib import Path diff --git a/src/openqlab/io/importers/gwinstek_lsf.py b/src/openqlab/io/importers/gwinstek_lsf.py index 81d5929a66dc600520f6f56992979d95632d63b1..1cc1e9efc387eddf8d40ed5818e46e5ede69c4e2 100644 --- a/src/openqlab/io/importers/gwinstek_lsf.py +++ b/src/openqlab/io/importers/gwinstek_lsf.py @@ -1,9 +1,9 @@ import numpy as np import pandas as pd -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer from pandas.errors import EmptyDataError -from OpenQlab.io.importers import utils +from openqlab.io.importers import utils import struct diff --git a/src/openqlab/io/importers/hp4395a.py b/src/openqlab/io/importers/hp4395a.py index 1474a1444545fe935cccedcaa8791fd86a2ed883..ba0bb93ec017dea42b25328eaba9f2d37ea8ff48 100644 --- a/src/openqlab/io/importers/hp4395a.py +++ b/src/openqlab/io/importers/hp4395a.py @@ -1,9 +1,9 @@ from typing import List import pandas as pd from pandas.errors import EmptyDataError -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer from pathlib import Path diff --git a/src/openqlab/io/importers/hp4395a_gpib.py b/src/openqlab/io/importers/hp4395a_gpib.py index 2be7acefe85583b9b0d19443e45efe488dca80db..7b3ef14522a6cd50e0f9d671d3e9f499bb3d5037 100644 --- a/src/openqlab/io/importers/hp4395a_gpib.py +++ b/src/openqlab/io/importers/hp4395a_gpib.py @@ -1,5 +1,5 @@ -from OpenQlab.io.base_importer import VisaImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.base_importer import VisaImporter +from openqlab.io.data_container import DataContainer import numpy as np import pandas as pd import serial @@ -77,7 +77,7 @@ class HP4395A_GPIB(VisaImporter): df.index.name = 'Frequency' header['xUnit'] = 'Hz' header['logX'] = True if gpib.command('SWPT?') == 'LOGF' else False - header['Channel'] = 1 if gpib.command('CHAN1?') == '1' else 2 + header['Channel'] = 1 if gpib.command('CHAN1?') == '1' else 2 output = DataContainer(df) output.update_header(header) return output diff --git a/src/openqlab/io/importers/keysight_binary.py b/src/openqlab/io/importers/keysight_binary.py index d1978f0c9c084aa5d3c41ecb02f50389a701779c..79779429be350ad899112c5ff1233c81731cd442 100644 --- a/src/openqlab/io/importers/keysight_binary.py +++ b/src/openqlab/io/importers/keysight_binary.py @@ -1,10 +1,10 @@ import struct import pandas as pd import numpy as np -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer -from OpenQlab.io.importers.OldImporters import agilent +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer +from openqlab.io.importers.OldImporters import agilent class KeysightBinary(StreamImporter): diff --git a/src/openqlab/io/importers/keysight_csv.py b/src/openqlab/io/importers/keysight_csv.py index 60a628b46bf44c361be541e647ef2ec6fa42fbb4..399072e042dcca9bf0dce5a8924cd9664e77c8ab 100644 --- a/src/openqlab/io/importers/keysight_csv.py +++ b/src/openqlab/io/importers/keysight_csv.py @@ -1,7 +1,7 @@ import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer class KeysightCSV(StreamImporter): diff --git a/src/openqlab/io/importers/keysight_fra.py b/src/openqlab/io/importers/keysight_fra.py index 98518f2c87fdce40ec2c2a634ee7aaf68e237571..196d54659a521302a34f34d7310883b6ab573a07 100644 --- a/src/openqlab/io/importers/keysight_fra.py +++ b/src/openqlab/io/importers/keysight_fra.py @@ -1,8 +1,8 @@ from re import match import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer class KeysightFRA(StreamImporter): diff --git a/src/openqlab/plots/__init__.py b/src/openqlab/plots/__init__.py index 9c1779384e4348e65fbf48b0666f2fbb130d38dc..516951ee7b8522d473153fb3b5bebda622cd4105 100644 --- a/src/openqlab/plots/__init__.py +++ b/src/openqlab/plots/__init__.py @@ -7,5 +7,5 @@ import matplotlib as mpl # mpl.style.use(['seaborn-colorblind','seaborn-dark']) # if hasattr(mpl, 'style'): # mpl.style.use('seaborn-dark') - # mpl.style.use('OpenQlab') + # mpl.style.use('openqlab') # mpl.style.use('ggplot')