aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qolab/__init__.py0
-rw-r--r--qolab/data/__init__.py (renamed from data/__init__.py)0
-rw-r--r--qolab/data/trace.py (renamed from data/trace.py)0
-rw-r--r--qolab/hardware/scope/__init__.py (renamed from hardware/scope/__init__.py)2
-rw-r--r--qolab/hardware/scope/sds1104x.py (renamed from hardware/scope/sds1104x.py)4
-rw-r--r--qolab/hardware/scpi.py (renamed from hardware/scpi.py)0
-rw-r--r--qolab/test/test_scope_sds1104x.py (renamed from test/test_scope_sds1104x.py)2
7 files changed, 4 insertions, 4 deletions
diff --git a/qolab/__init__.py b/qolab/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/qolab/__init__.py
diff --git a/data/__init__.py b/qolab/data/__init__.py
index 528815a..528815a 100644
--- a/data/__init__.py
+++ b/qolab/data/__init__.py
diff --git a/data/trace.py b/qolab/data/trace.py
index 9b14264..9b14264 100644
--- a/data/trace.py
+++ b/qolab/data/trace.py
diff --git a/hardware/scope/__init__.py b/qolab/hardware/scope/__init__.py
index 23462a7..a323b8f 100644
--- a/hardware/scope/__init__.py
+++ b/qolab/hardware/scope/__init__.py
@@ -2,7 +2,7 @@
Provide basic class to operate scope
Created by Eugeniy E. Mikhailov 2021/11/29
"""
-from hardware.scpi import SCPIinstr
+from qolab.hardware.scpi import SCPIinstr
class Scope:
diff --git a/hardware/scope/sds1104x.py b/qolab/hardware/scope/sds1104x.py
index 4a12b46..292ea7c 100644
--- a/hardware/scope/sds1104x.py
+++ b/qolab/hardware/scope/sds1104x.py
@@ -3,8 +3,8 @@ Provide basic class to operate scope
Created by Eugeniy E. Mikhailov 2021/11/29
"""
-from hardware.scope import ScopeSCPI
-from data.trace import Trace
+from qolab.hardware.scope import ScopeSCPI
+from qolab.data.trace import Trace
import re
import numpy as np
diff --git a/hardware/scpi.py b/qolab/hardware/scpi.py
index 279ef24..279ef24 100644
--- a/hardware/scpi.py
+++ b/qolab/hardware/scpi.py
diff --git a/test/test_scope_sds1104x.py b/qolab/test/test_scope_sds1104x.py
index ef60a38..c5c890f 100644
--- a/test/test_scope_sds1104x.py
+++ b/qolab/test/test_scope_sds1104x.py
@@ -1,5 +1,5 @@
import pyvisa
-from hardware.scope import SDS1104X
+from qolab.hardware.scope import SDS1104X
if __name__ == '__main__':
print("Testing SDS1104X")