Clean up pyvisa and other imports

mabuchilab · Nov 15, 2023 · b577632 · b577632
1 parent 74d80d2
commit b577632
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 155 deletions.
diff --git a/instrumental/drivers/funcgenerators/rigol.py b/instrumental/drivers/funcgenerators/rigol.py
@@ -4,10 +4,11 @@
 Driver module for Rigol signal generators.
 """
 from enum import Enum, auto
+
+from pyvisa import ResourceManager
+
+from .. import ParamSet, SCPI_Facet, VisaMixin
 from . import FunctionGenerator
-from .. import VisaMixin, SCPI_Facet
-from .. import ParamSet
-from visa import ResourceManager
 
 _INST_PARAMS = ['visa_address']
 _INST_VISA_INFO = {

diff --git a/instrumental/drivers/powersupplies/rigol.py b/instrumental/drivers/powersupplies/rigol.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from . import PowerSupply
-from .. import VisaMixin, Facet, SCPI_Facet
-from ... import u, Q_
-from .. import ParamSet
+import re
 from enum import Enum
-from visa import ResourceManager
+
 import pyvisa
-import re
+
+from ... import Q_, u
+from .. import ParamSet, SCPI_Facet, VisaMixin
+from . import PowerSupply
 
 _INST_PARAMS_ = ['visa_address']
 _INST_VISA_INFO_ = {
@@ -18,7 +18,7 @@ def list_instruments():
     """Get a list of all power supplies currently attached"""
     paramsets = []
     search_string = "ASRL?*"
-    rm = ResourceManager()
+    rm = pyvisa.ResourceManager()
     raw_spec_list = rm.list_resources(search_string)
 
     for spec in raw_spec_list:
@@ -96,4 +96,4 @@ def local(self):
         self.write('SYSTem:LOCal')
 
     def remote(self):
-        self.write('SYSTem:REMote')
+        self.write('SYSTem:REMote')
diff --git a/instrumental/drivers/scopes/rigol.py b/instrumental/drivers/scopes/rigol.py
@@ -4,21 +4,14 @@
 
 * DS1000Z series
 """
-import pyvisa
-from pyvisa.constants import InterfaceType
-import numpy as np
-from pint import UndefinedUnitError
-from . import Scope
-from .. import VisaMixin, SCPI_Facet, Facet
-from ..util import visa_context
-from ... import u, Q_
-from enum import Enum
-from .. import ParamSet
-from visa import ResourceManager
-from enum import Enum
 import time
+from enum import Enum
+
 import numpy as np
-from struct import unpack
+from pyvisa import ResourceManager
+
+from .. import ParamSet, SCPI_Facet, VisaMixin
+from . import Scope
 
 _INST_PARAMS_ = ['visa_address']
 _INST_VISA_INFO_ = {
@@ -152,4 +145,4 @@ def remote(self):
 
 
 class DS1000Z(RigolScope, VisaMixin):
-    pass
+    pass
diff --git a/instrumental/drivers/scopes/tektronix.py b/instrumental/drivers/scopes/tektronix.py
@@ -5,18 +5,17 @@
 """
 import datetime as dt
 
-import pyvisa
-from pyvisa.constants import InterfaceType
 import numpy as np
+import pyvisa
 from pint import UndefinedUnitError
+from pyvisa.constants import InterfaceType
 
-from . import Scope
-from .. import VisaMixin, SCPI_Facet, Facet
-from ..util import visa_context
-from ...util import to_str
+from ... import Q_, u
 from ...errors import Error
-from ... import u, Q_
-
+from ...util import to_str
+from .. import Facet, SCPI_Facet, VisaMixin
+from ..util import visa_context
+from . import Scope
 
 MODEL_CHANNELS = {
     'TDS 210': 2,

diff --git a/instrumental/drivers/spectrometers/agilent.py b/instrumental/drivers/spectrometers/agilent.py
@@ -1,25 +1,17 @@
 # -*- coding: utf-8 -*-
-# Copyright 2013-2015 Nate Bogdanowicz
+# Copyright 2023 Dodd Gray
 """
 Driver module for HP 70000 spectrum analyzer.
 Based on Nate's Tektronix scope driver
 """
 
-# import visa
-# import numpy as np
-# from instrumental import u, Q_
-# from pint import UndefinedUnitError
-# from instrumental.drivers.spectrometers import Spectrometer
-# from instrumental.drivers import _get_visa_instrument
-
-import pyvisa
-from pyvisa.constants import InterfaceType
 import numpy as np
 from pint import UndefinedUnitError
+from pyvisa.constants import VI_SUCCESS_MAX_CNT, SerialTermination
+
+from ... import Q_, u
+from .. import VisaMixin
 from . import Spectrometer
-from .. import VisaMixin, SCPI_Facet
-#from ..util import visa_context
-from ... import u, Q_
 
 _INST_PARAMS_ = ['visa_address']
 _INST_VISA_INFO_ = {
@@ -30,46 +22,13 @@ class AgilentOSA(Spectrometer, VisaMixin):
     """
     A base class for HP 70000 series spectrum analyzers
     """
-    # def __init__(self,params=None):
-    #     """
-    #     Create a spectrometer object that has the given VISA name *name* and connect
-    #     to it. You can find available instrument names using the VISA
-    #     Instrument Manager.
-    #     """
-    #     if params:
-    #         self.inst = _instrument(params)
-    #     else:
-    #         self.inst = _instrument(default_params)
-    #     self.inst.read_termination = "\n"  # Needed for stripping termination
-    #     #self.inst.write("header OFF")
-    #     self.inst.write_termination = ';'
-    #     self.inst.write('TDF P') # set the trace data format to be decimal numbers in parameter units
-
     _INST_PARAMS_ = ['visa_address']
     _INST_VISA_INFO_ = ('AGILENT', ['86142B'])
 
     def _initialize(self):
         self._rsrc.read_termination = '\n'  # Needed for stripping termination
         self._rsrc.timeout = 300
-        #self.inst.write("header OFF")
-        # self._rsrc.write_termination = ';'
         self.write('FORMAT:DATA REAL32') # set the trace data format to be decimal numbers in parameter units
-        # if self.interface_type == InterfaceType.asrl:
-        #     terminator = self.query('RS232:trans:term?').strip()
-        #     self._rsrc.read_termination = terminator.replace('CR', '\r').replace('LF', '\n')
-        # elif self.interface_type == InterfaceType.usb:
-        #     terminator = self.query('RS232:trans:term?').strip()
-        #     self._rsrc.read_termination = terminator.replace('CR', '\r').replace('LF', '\n')
-        # elif self.interface_type == InterfaceType.tcpip:
-        #     pass
-        # else:
-        #     pass
-        #
-        # self.write("header OFF")
-
-    # def instrument_presets(self):
-    #     self.write('IP')
-    #     self.write('TDF P') # set the trace data format to be decimal numbers in parameter units
 
     def set_center_wavelength(self,cf):
         cf_nm = cf.to(u.nm).magnitude
@@ -159,8 +118,6 @@ def get_spectrum(self,trace='A'):
         self._rsrc.timeout = 300
         return wl, amp
 
-
-
     def get_data(self, channel=1):
         """Retrieve a trace from the scope.
 
@@ -193,17 +150,17 @@ def get_data(self, channel=1):
         inst.timeout = 10000
         inst.write("curve?")
         inst.read_termination = None
-        inst.end_input = pyvisa.constants.SerialTermination.none
+        inst.end_input = SerialTermination.none
         # TODO: Change this to be more efficient for huge datasets
-        with inst.ignore_warning(pyvisa.constants.VI_SUCCESS_MAX_CNT):
+        with inst.ignore_warning(VI_SUCCESS_MAX_CNT):
             s = inst.visalib.read(inst.session, 2)  # read first 2 bytes
             num_bytes = int(inst.visalib.read(inst.session, int(s[0][1]))[0])
             buf = ''
             while len(buf) < num_bytes:
                 raw_bin, _ = inst.visalib.read(inst.session, num_bytes-len(buf))
                 buf += raw_bin
                 print(len(raw_bin))
-        inst.end_input = pyvisa.constants.SerialTermination.termination_char
+        inst.end_input = SerialTermination.termination_char
         inst.read_termination = '\n'
         inst.read()  # Eat termination
         inst.timeout = tmo
@@ -243,5 +200,3 @@ def get_data(self, channel=1):
         data_y = Q_((raw_data_y - y_offset)*y_scale + y_zero, y_unit)
 
         return data_x, data_y
-
-
diff --git a/instrumental/drivers/spectrometers/ando.py b/instrumental/drivers/spectrometers/ando.py
@@ -1,26 +1,20 @@
 # -*- coding: utf-8 -*-
-# Copyright 2013-2015 Nate Bogdanowicz
+# Copyright 2023 Dodd Gray
 """
 Driver module for Yokogawa/Ando spectrum analyzers.
 Based on Nate's Tektronix scope driver
 """
 
-# import visa
-# import numpy as np
-# from instrumental import u, Q_
-# from pint import UndefinedUnitError
-# from instrumental.drivers.spectrometers import Spectrometer
-# from instrumental.drivers import _get_visa_instrument
+from time import sleep
 
-import visa
-from pyvisa.constants import InterfaceType
 import numpy as np
-from time import sleep
+import pyvisa
 from pint import UndefinedUnitError
+from pyvisa.constants import InterfaceType
+
+from ... import Q_, u
+from .. import VisaMixin
 from . import Spectrometer
-from .. import VisaMixin, SCPI_Facet
-#from ..util import visa_context
-from ... import u, Q_
 
 _INST_PARAMS = ['visa_address']
 _INST_VISA_INFO = {
@@ -230,17 +224,17 @@ def get_data(self, channel=1):
         inst.timeout = 10000
         inst.write("curve?")
         inst.read_termination = None
-        inst.end_input = visa.constants.SerialTermination.none
+        inst.end_input = pyvisa.constants.SerialTermination.none
         # TODO: Change this to be more efficient for huge datasets
-        with inst.ignore_warning(visa.constants.VI_SUCCESS_MAX_CNT):
+        with inst.ignore_warning(pyvisa.constants.VI_SUCCESS_MAX_CNT):
             s = inst.visalib.read(inst.session, 2)  # read first 2 bytes
             num_bytes = int(inst.visalib.read(inst.session, int(s[0][1]))[0])
             buf = ''
             while len(buf) < num_bytes:
                 raw_bin, _ = inst.visalib.read(inst.session, num_bytes-len(buf))
                 buf += raw_bin
                 print(len(raw_bin))
-        inst.end_input = visa.constants.SerialTermination.termination_char
+        inst.end_input = pyvisa.constants.SerialTermination.termination_char
         inst.read_termination = '\n'
         inst.read()  # Eat termination
         inst.timeout = tmo
@@ -403,4 +397,4 @@ def set_measurement_nsamps(self, nsamps):
         nsamps : int
             Number of samples used to compute measurements
         """
-        self.inst.write("measu:stati:weighting {}".format(nsamps))
+        self.inst.write("measu:stati:weighting {}".format(nsamps))
diff --git a/instrumental/drivers/spectrometers/hp.py b/instrumental/drivers/spectrometers/hp.py
@@ -1,25 +1,17 @@
 # -*- coding: utf-8 -*-
-# Copyright 2013-2015 Nate Bogdanowicz
+# Copyright 2023 Dodd Gray
 """
 Driver module for HP 70000 spectrum analyzer.
 Based on Nate's Tektronix scope driver
 """
 
-# import visa
-# import numpy as np
-# from instrumental import u, Q_
-# from pint import UndefinedUnitError
-# from instrumental.drivers.spectrometers import Spectrometer
-# from instrumental.drivers import _get_visa_instrument
-
-import pyvisa
-from pyvisa.constants import InterfaceType
 import numpy as np
+import pyvisa
 from pint import UndefinedUnitError
+
+from ... import Q_, u
+from .. import VisaMixin
 from . import Spectrometer
-from .. import VisaMixin, SCPI_Facet
-#from ..util import visa_context
-from ... import u, Q_
 
 _INST_PARAMS = ['visa_address']
 _INST_VISA_INFO = {
@@ -38,39 +30,11 @@ class HPOSA(Spectrometer, VisaMixin):
     """
     A base class for HP 70000 series spectrum analyzers
     """
-    # def __init__(self,params=None):
-    #     """
-    #     Create a spectrometer object that has the given VISA name *name* and connect
-    #     to it. You can find available instrument names using the VISA
-    #     Instrument Manager.
-    #     """
-    #     if params:
-    #         self.inst = _instrument(params)
-    #     else:
-    #         self.inst = _instrument(default_params)
-    #     self.inst.read_termination = "\n"  # Needed for stripping termination
-    #     #self.inst.write("header OFF")
-    #     self.inst.write_termination = ';'
-    #     self.inst.write('TDF P') # set the trace data format to be decimal numbers in parameter units
-
     def _initialize(self):
         self._rsrc.read_termination = '\n'  # Needed for stripping termination
         self._rsrc.timeout = 300
-        #self.inst.write("header OFF")
         self._rsrc.write_termination = ';'
         self.write('TDF P') # set the trace data format to be decimal numbers in parameter units
-        # if self.interface_type == InterfaceType.asrl:
-        #     terminator = self.query('RS232:trans:term?').strip()
-        #     self._rsrc.read_termination = terminator.replace('CR', '\r').replace('LF', '\n')
-        # elif self.interface_type == InterfaceType.usb:
-        #     terminator = self.query('RS232:trans:term?').strip()
-        #     self._rsrc.read_termination = terminator.replace('CR', '\r').replace('LF', '\n')
-        # elif self.interface_type == InterfaceType.tcpip:
-        #     pass
-        # else:
-        #     pass
-        #
-        # self.write("header OFF")
 
     def instrument_presets(self):
         self.write('IP')
@@ -160,8 +124,6 @@ def get_spectrum(self,trace='A'):
         self._rsrc.timeout = 300
         return wl, amp
 
-
-
     def get_data(self, channel=1):
         """Retrieve a trace from the scope.
 
@@ -367,4 +329,4 @@ def set_measurement_nsamps(self, nsamps):
         nsamps : int
             Number of samples used to compute measurements
         """
-        self.inst.write("measu:stati:weighting {}".format(nsamps))
+        self.inst.write("measu:stati:weighting {}".format(nsamps))