Removed _modclass and _modtype class variables from all modules. Thes…

…e were not used anymore.
sakoho81 · Jul 17, 2019 · d3d0d0f · d3d0d0f
1 parent 872d22e
commit d3d0d0f
Show file tree

Hide file tree

Showing 147 changed files with 54 additions and 419 deletions.
diff --git a/core/module.py b/core/module.py
@@ -127,9 +127,6 @@ class BaseMixin(metaclass=ModuleMeta):
     * Get status variables
     * Reload module data (from saved variables)
     """
-
-    _modclass = 'base'
-    _modtype = 'base'
     _threaded = False
     _connectors = dict()
 

diff --git a/gui/automation/automationgui.py b/gui/automation/automationgui.py
@@ -30,10 +30,8 @@
 
 class AutomationGui(GUIBase):
     """ Graphical interface for arranging tasks without using Python code. """
-    _modclass = 'AutomationGui'
-    _modtype = 'gui'
-    ## declare connectors
 
+    # declare connectors
     automationlogic = Connector(interface='AutomationLogic')
 
     sigRunTaskFromList = QtCore.Signal(object)

diff --git a/gui/camera/cameragui.py b/gui/camera/cameragui.py
@@ -69,8 +69,6 @@ def __init__(self):
 class CameraGUI(GUIBase):
     """ Main spectrometer camera class.
     """
-    _modclass = 'CameraGui'
-    _modtype = 'gui'
 
     camera_logic = Connector(interface='CameraLogic')
     savelogic = Connector(interface='SaveLogic')

diff --git a/gui/confocal/confocalgui.py b/gui/confocal/confocalgui.py
@@ -93,8 +93,6 @@ def __init__(self):
 class ConfocalGui(GUIBase):
     """ Main Confocal Class for xy and depth scans.
     """
-    _modclass = 'ConfocalGui'
-    _modtype = 'gui'
 
     # declare connectors
     confocallogic1 = Connector(interface='ConfocalLogic')

diff --git a/gui/counter/countergui.py b/gui/counter/countergui.py
@@ -49,11 +49,8 @@ def __init__(self, **kwargs):
 
 
 class CounterGui(GUIBase):
-
     """ FIXME: Please document
     """
-    _modclass = 'countergui'
-    _modtype = 'gui'
 
     # declare connectors
     counterlogic1 = Connector(interface='CounterLogic')

diff --git a/gui/gated_counter/gated_counter_gui.py b/gui/gated_counter/gated_counter_gui.py
@@ -47,13 +47,11 @@ def __init__(self):
         uic.loadUi(ui_file, self)
         self.show()
 
+
 class GatedCounterGui(GUIBase):
     """ Main GUI for the Gated Counting. """
 
-    _modclass = 'GatedCounterGui'
-    _modtype = 'gui'
-
-    ## declare connectors
+    # declare connectors
     gatedcounterlogic1 = Connector(interface='GatedCounterLogic')
     traceanalysislogic1 = Connector(interface='TraceAnalysisLogic')
 

diff --git a/gui/guibase.py b/gui/guibase.py
@@ -28,8 +28,6 @@
 class GUIBaseMixin(BaseMixin):
     """This is the GUI base class. It provides functions that every GUI module should have.
     """
-    _modclass = 'GUIBase'
-    _modtype = 'Gui'
 
     def show(self):
         warnings.warn('Every GUI module needs to reimplement the show() '

diff --git a/gui/laser/laser.py b/gui/laser/laser.py
@@ -65,8 +65,6 @@ def __init__(self):
 class LaserGUI(GUIBase):
     """ FIXME: Please document
     """
-    _modclass = 'lasergui'
-    _modtype = 'gui'
 
     ## declare connectors
     laserlogic = Connector(interface='LaserLogic')

diff --git a/gui/laserscanner/laserscannergui.py b/gui/laserscanner/laserscannergui.py
@@ -50,10 +50,8 @@ class VoltScanGui(GUIBase):
     """
 
     """
-    _modclass = 'VoltScanGui'
-    _modtype = 'gui'
 
-    ## declare connectors
+    # declare connectors
     voltagescannerlogic1 = Connector(interface='VoltageScannerLogic')
     savelogic = Connector(interface='SaveLogic')
 

diff --git a/gui/magnet/magnet_gui.py b/gui/magnet/magnet_gui.py
@@ -92,10 +92,7 @@ def __init__(self):
 class MagnetGui(GUIBase):
     """ Main GUI for the magnet. """
 
-    _modclass = 'MagnetGui'
-    _modtype = 'gui'
-
-    ## declare connectors
+    # declare connectors
     magnetlogic1 = Connector(interface='MagnetLogic')
     savelogic = Connector(interface='SaveLogic')
 

diff --git a/gui/nuclear_operations/nuclear_operations.py b/gui/nuclear_operations/nuclear_operations.py
@@ -40,12 +40,10 @@ def __init__(self):
         uic.loadUi(ui_file, self)
         self.show()
 
+
 class NuclearOperationsGui(GUIBase):
     """ This is the main GUI Class for Nuclear Operations. """
 
-    _modclass = 'NuclearOperationsGui'
-    _modtype = 'gui'
-
     # declare connectors
     nuclearoperationslogic = Connector(interface='NuclearOperationsLogic')
     savelogic = Connector(interface='SaveLogic')

diff --git a/gui/odmr/odmrgui.py b/gui/odmr/odmrgui.py
@@ -68,9 +68,6 @@ class ODMRGui(GUIBase):
     This is the GUI Class for ODMR measurements
     """
 
-    _modclass = 'ODMRGui'
-    _modtype = 'gui'
-
     # declare connectors
     odmrlogic1 = Connector(interface='ODMRLogic')
     savelogic = Connector(interface='SaveLogic')

diff --git a/gui/pidgui/pidgui.py b/gui/pidgui/pidgui.py
@@ -49,10 +49,8 @@ def __init__(self):
 class PIDGui(GUIBase):
     """ FIXME: Please document
     """
-    _modclass = 'pidgui'
-    _modtype = 'gui'
 
-    ## declare connectors
+    # declare connectors
     pidlogic = Connector(interface='PIDLogic')
 
     sigStart = QtCore.Signal()

diff --git a/gui/poimanager/poimangui.py b/gui/poimanager/poimangui.py
@@ -237,12 +237,8 @@ def __init__(self):
 
 
 class PoiManagerGui(GUIBase):
-
     """ This is the GUI Class for PoiManager """
 
-    _modclass = 'PoiManagerGui'
-    _modtype = 'gui'
-
     # declare connectors
     poimanagerlogic = Connector(interface='PoiManagerLogic')
     scannerlogic = Connector(interface='ConfocalLogic')

diff --git a/gui/pulsed/pulsed_maingui.py b/gui/pulsed/pulsed_maingui.py
@@ -142,10 +142,6 @@ def __init__(self):
 
 class PulsedMeasurementGui(GUIBase):
     """ This is the main GUI Class for pulsed measurements. """
-
-    _modclass = 'PulsedMeasurementGui'
-    _modtype = 'gui'
-
     ## declare connectors
     pulsedmasterlogic = Connector(interface='PulsedMasterLogic')
 

diff --git a/gui/qdplotter/qdplottergui.py b/gui/qdplotter/qdplottergui.py
@@ -47,11 +47,8 @@ def __init__(self):
 
 
 class QdplotterGui(GUIBase):
-
     """ FIXME: Please document
     """
-    _modclass = 'qdplotgui'
-    _modtype = 'gui'
 
     # declare connectors
     qdplotlogic1 = Connector(interface='QdplotLogic')

diff --git a/gui/simpledatagui/simpledatagui.py b/gui/simpledatagui/simpledatagui.py
@@ -48,10 +48,7 @@ def __init__(self):
 class SimpleDataGui(GUIBase):
     """ FIXME: Please document
     """
-    _modclass = 'simplegui'
-    _modtype = 'gui'
-
-    ## declare connectors
+    # declare connectors
     simplelogic = Connector(interface='SimpleDataLogic')
 
     sigStart = QtCore.Signal()

diff --git a/gui/spectrometer/spectrometergui.py b/gui/spectrometer/spectrometergui.py
@@ -49,8 +49,8 @@ def __init__(self):
 
 
 class SpectrometerGui(GUIBase):
-    _modclass = 'SpectrometerGui'
-    _modtype = 'gui'
+    """
+    """
 
     # declare connectors
     spectrumlogic = Connector(interface='SpectrumLogic')

diff --git a/gui/switcher/switchgui.py b/gui/switcher/switchgui.py
@@ -31,9 +31,8 @@
 class SwitchGui(GUIBase):
     """ A grephical interface to mofe switches by hand and change their calibration.
     """
-    _modclass = 'SwitchGui'
-    _modtype = 'gui'
-    ## declare connectors
+
+    # declare connectors
     switchlogic = Connector(interface='SwitchLogic')
 
     def on_activate(self):

diff --git a/gui/taskrunner/taskgui.py b/gui/taskrunner/taskgui.py
@@ -31,9 +31,8 @@
 class TaskGui(GUIBase):
     """ A grephical interface to mofe switches by hand and change their calibration.
     """
-    _modclass = 'TaskGui'
-    _modtype = 'gui'
-    ## declare connectors
+
+    # declare connectors
     tasklogic = Connector(interface='TaskRunner')
 
     sigRunTaskFromList = QtCore.Signal(object)

diff --git a/gui/wavemeterlogger/wavemeterloggui.py b/gui/wavemeterlogger/wavemeterloggui.py
@@ -52,10 +52,9 @@ def __init__(self):
 
 
 class WavemeterLogGui(GUIBase):
-    _modclass = 'WavemeterLogGui'
-    _modtype = 'gui'
-
-    ## declare connectors
+    """
+    """
+    # declare connectors
     wavemeterloggerlogic1 = Connector(interface='WavemeterLoggerLogic')
     savelogic = Connector(interface='SaveLogic')
 

diff --git a/hardware/CTC100_temperature.py b/hardware/CTC100_temperature.py
@@ -23,6 +23,7 @@
 from core.module import Base, ConfigOption
 import visa
 
+
 class CTC100(Base):
     """ This module implements communication with CTC100 temperature controllers
     or clones/licensed devices.
@@ -38,9 +39,6 @@ class CTC100(Base):
 
     """
 
-    _modclass = 'ctc100'
-    _modtype = 'hardware'
-
     # config options
     _interface = ConfigOption('interface', missing='error')
 

diff --git a/hardware/awg/keysight_M3202A.py b/hardware/awg/keysight_M3202A.py
@@ -54,8 +54,6 @@ class M3202A(Base, PulserInterface):
         awg_serial: 0000000000 # here the serial number of current AWG
 
     """
-    _modclass = 'M3202A'
-    _modtype = 'hardware'
 
     # config options
     serial = ConfigOption(name='awg_serial', missing='error')

diff --git a/hardware/awg/tektronix_awg5002c.py b/hardware/awg/tektronix_awg5002c.py
@@ -53,9 +53,6 @@ class AWG5002C(Base, PulserInterface):
         # default_sample_rate: 600.0e6 # optional, the default sampling rate
     """
 
-    _modclass = 'awg5002c'
-    _modtype = 'hardware'
-
     # config options
     ip_address = ConfigOption('awg_ip_address', missing='error')
     port = ConfigOption('awg_port', missing='error')

diff --git a/hardware/awg/tektronix_awg70k.py b/hardware/awg/tektronix_awg70k.py
@@ -53,8 +53,6 @@ class AWG70K(Base, PulserInterface):
         # ftp_passwd: 'anonymous@' # optional, the password for ftp login
 
     """
-    _modclass = 'awg70k'
-    _modtype = 'hardware'
 
     # config options
     _visa_address = ConfigOption(name='awg_visa_address', missing='error')

diff --git a/hardware/awg/tektronix_awg7k.py b/hardware/awg/tektronix_awg7k.py
@@ -52,9 +52,6 @@ class AWG7k(Base, PulserInterface):
 
     """
 
-    _modclass = 'awg7k'
-    _modtype = 'hardware'
-
     # config options
     _tmp_work_dir = ConfigOption(name='tmp_work_dir',
                                  default=os.path.join(get_home_dir(), 'pulsed_files'),

diff --git a/hardware/camera/andor/iXon897_ultra.py b/hardware/camera/andor/iXon897_ultra.py
@@ -118,9 +118,6 @@ class IxonUltra(Base, CameraInterface):
 
     """
 
-    _modtype = 'camera'
-    _modclass = 'hardware'
-
     _dll_location = ConfigOption('dll_location', missing='error')
     _default_exposure = ConfigOption('default_exposure', 1.0)
     _default_read_mode = ConfigOption('default_read_mode', 'IMAGE')

diff --git a/hardware/camera/camera_dummy.py b/hardware/camera/camera_dummy.py
@@ -40,9 +40,6 @@ class CameraDummy(Base, CameraInterface):
         gain: 1.0
     """
 
-    _modtype = 'DummyCamera'
-    _modclass = 'hardware'
-
     _support_live = ConfigOption('support_live', True)
     _camera_name = ConfigOption('camera_name', 'Dummy camera')
     _resolution = ConfigOption('resolution', (1280, 720))  # High-definition !

diff --git a/hardware/camera/thorlabs/thorlabs_DCx.py b/hardware/camera/thorlabs/thorlabs_DCx.py
@@ -48,9 +48,6 @@ class CameraThorlabs(Base, CameraInterface):
 
     """
 
-    _modtype = 'camera'
-    _modclass = 'hardware'
-
     _default_exposure = ConfigOption('default_exposure', 0.1)
     _default_gain = ConfigOption('default_gain', 1.0)
     _id_camera = ConfigOption('id_camera', 0)  # if more than one camera is present

diff --git a/hardware/confocal_scanner_dummy.py b/hardware/confocal_scanner_dummy.py
@@ -38,9 +38,6 @@ class ConfocalScannerDummy(Base, ConfocalScannerInterface):
 
     """
 
-    _modclass = 'ConfocalScannerDummy'
-    _modtype = 'hardware'
-
     # connectors
     fitlogic = Connector(interface='FitLogic')
 

diff --git a/hardware/dtg/dtg5334.py b/hardware/dtg/dtg5334.py
@@ -42,8 +42,6 @@ class DTG5334(Base, PulserInterface):
         visa_address: 'GPIB0::12::INSTR'
 
     """
-    _modclass = 'dtg5334'
-    _modtype = 'hardware'
 
     visa_address = ConfigOption('visa_address', missing='error')
 

diff --git a/hardware/edwards_vacuum_controller.py b/hardware/edwards_vacuum_controller.py
@@ -37,10 +37,6 @@ class EdwardsVacuumController(Base):
         interface: 'ASRL1::INSTR'
 
     """
-
-    _modclass = 'edwards_pump'
-    _modtype = 'hardware'
-
     # config options
     _interface = ConfigOption('interface', missing='error')
 

diff --git a/hardware/fast_counter_dummy.py b/hardware/fast_counter_dummy.py
@@ -40,8 +40,6 @@ class FastCounterDummy(Base, FastCounterInterface):
         #load_trace: None # path to the saved dummy trace
 
     """
-    _modclass = 'fastcounterinterface'
-    _modtype = 'hardware'
 
     # config option
     _gated = ConfigOption('gated', False, missing='warn')

diff --git a/hardware/fastcomtec/fastcomtecmcs6.py b/hardware/fastcomtec/fastcomtecmcs6.py
@@ -159,6 +159,7 @@ class BOARDSETTING(ctypes.Structure):
                 ('fstchan',     ctypes.c_double),
                 ('timepreset',  ctypes.c_double), ]
 
+
 class FastComtec(Base, FastCounterInterface):
     """ Hardware Class for the FastComtec Card.
 
@@ -175,8 +176,6 @@ class FastComtec(Base, FastCounterInterface):
 
     """
 
-    _modclass = 'FastComtec'
-    _modtype = 'hardware'
     gated = ConfigOption('gated', False, missing='warn')
     trigger_safety = ConfigOption('trigger_safety', 400e-9, missing='warn')
     aom_delay = ConfigOption('aom_delay', 390e-9, missing='warn')