Skip to content

Commit 4d50482

Browse files
mplilly4395mplilly4395
authored
Merge pull request #233 from sandialabs/driver_org
Driver organization
2 parents a8f1c3d + 37f8160 commit 4d50482

File tree

85 files changed

+181
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+181
-104
lines changed

‎pyscan/__init__.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from pyscan.general import *
2-
from pyscan.measurement import *
3-
from pyscan.drivers import *
4-
from pyscan.plotting import *
5-
from pyscan.drivers.testing import *
1+
from .general import *
2+
from .measurement import *
3+
from .drivers import *
4+
from .plotting import *
5+
from .drivers.testing import *

‎pyscan/drivers/__init__.py‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,28 @@
33
# Objects
44
from .instrument_driver import InstrumentDriver
55

6-
# Instrument Drivers
7-
from .agilent33500 import Agilent33500
8-
from .agilent34410 import Agilent34410
9-
from .agilentdso900series import AgilentDSO900Series
10-
from .agilent8267d import AgilentE8267D
11-
from .agilent8275n import Agilent8275N
12-
from .americanmagnetics430 import AmericanMagnetics430
13-
from .blueforslog import BlueForsLog
14-
from .bkprecision9130b import BKPrecision9130B
15-
from .hp34401a import HP34401A
16-
from .keithley2260b import Keithley2260B
17-
from .keithley2400 import Keithley2400
18-
from .kepcoBOP import KepcoBOP
19-
from .oxfordips120 import OxfordIPS120
20-
from .pulselaser import PulseLaser
21-
from .stanford396 import Stanford396
22-
from .stanford400 import Stanford400
23-
from .stanford470 import Stanford470
24-
from .stanford620 import Stanford620
25-
from .stanford830 import Stanford830
26-
from .stanford860 import Stanford860
27-
from .stanford900 import Stanford900
28-
from .stanford928 import Stanford928
29-
from .tpi1002a import TPI1002A
30-
from .yokogawags200 import YokogawaGS200
31-
from .actonsp2300 import ActonSP2300
32-
336
# Brand collections
7+
from .agilent import *
8+
from .american_magnetics import *
9+
from .attocube import *
10+
from .bkprecision import *
11+
from .bluefors import *
12+
from .hp import *
13+
from .keithley import *
14+
from .kepco import *
15+
from .oceanoptics import *
16+
from .oxford import *
17+
from .princeton_instruments import *
18+
from .stanford import *
19+
from .swabian import *
20+
from .tpi import *
21+
from .yokogawa import *
22+
from .zurich_instruments import *
23+
24+
# Brand collections with special dependencies
3425
from .heliotis import *
3526
from .keysight import *
27+
from .picoquant import *
3628
from .thorlabs import *
3729
from .spin_core import *
3830

‎pyscan/drivers/agilent/__init__.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from .agilent8267d import AgilentE8267D
2+
from .agilent8275n import Agilent8275N
3+
from .agilent33500 import Agilent33500
4+
from .agilent34410 import Agilent34410
5+
from .agilentdso900series import AgilentDSO900Series

pyscan/drivers/agilent33500.py renamed to pyscan/drivers/agilent/agilent33500.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
2-
from .instrument_driver import InstrumentDriver
2+
from ..instrument_driver import InstrumentDriver
33
import re
4-
from pyscan.general.d_range import drange
4+
from ...general.d_range import drange
55
import numpy as np
66

77

pyscan/drivers/agilent34410.py renamed to pyscan/drivers/agilent/agilent34410.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
from .instrument_driver import InstrumentDriver
2+
from ..instrument_driver import InstrumentDriver
33

44

55
class Agilent34410(InstrumentDriver):

pyscan/drivers/agilent8267d.py renamed to pyscan/drivers/agilent/agilent8267d.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
from .instrument_driver import InstrumentDriver
2+
from ..instrument_driver import InstrumentDriver
33

44

55
class AgilentE8267D(InstrumentDriver):

pyscan/drivers/agilent8275n.py renamed to pyscan/drivers/agilent/agilent8275n.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
from .instrument_driver import InstrumentDriver
2+
from ..instrument_driver import InstrumentDriver
33

44

55
class Agilent8275N(InstrumentDriver):

pyscan/drivers/agilentdso900series.py renamed to pyscan/drivers/agilent/agilentdso900series.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
import numpy as np
33
from math import ceil
4-
from .instrument_driver import InstrumentDriver
4+
from ..instrument_driver import InstrumentDriver
55

66

77
class AgilentDSO900Series(InstrumentDriver):

‎pyscan/drivers/american_magnetics/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from .americanmagnetics430 import AmericanMagnetics430

pyscan/drivers/americanmagnetics430.py renamed to pyscan/drivers/american_magnetics/americanmagnetics430.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .instrument_driver import InstrumentDriver
1+
from ..instrument_driver import InstrumentDriver
22
from time import sleep
33

44

0 commit comments

Comments
 (0)