fix(driver): fixed flake8 errors and a few other imports

Author: cint-transport

.flake8

@@ -23,6 +23,7 @@ per-file-ignores =
     pyscan/general/__init__.py:F401,F403
     pyscan/drivers/__init__.py:F401,F403
     pyscan/plotting/__init__.py:F401,F403
+    */__init__.py:F401,F403
 
 # 120 characters is a more agreeable max line length for modern displays
 max-line-length=120

pyscan/drivers/exceptions/external_package_excpetion.py

@@ -5,4 +5,3 @@ class ExternalPackageException(Exception):
     def __init__(self, message):
 
         super().__init__(message)
-

pyscan/drivers/heliotis/__init__.py

@@ -1,9 +1,8 @@
-import importlib.util
 import sys
 
 name = 'libHeLIC'
 
 if name in sys.modules:
     from .helioscamera import HeliosCamera
-else: 
+else:
     from .exceptions import HeliosImportException as HeliosCamera

pyscan/drivers/heliotis/exceptions.py

@@ -1,10 +1,11 @@
-from itemattribute import ItemAttribute
+from ...general.item_attribute import ItemAttribute
 from ..exceptions.external_package_excpetion import ExternalPackageException
 
+
 class HeliosImportException(ItemAttribute):
 
     def __init__(self, *arg, **kwarg):
 
         msg = "Helios SDK SD1 could not load this driver"
 
-        raise ExternalPackageException(msg)
+        raise ExternalPackageException(msg)

pyscan/drivers/heliotis/helios_sdk.py

@@ -1,6 +1,15 @@
 from pyscan.general.item_attribute import ItemAttribute
 
 
+def sense_tqp_to_frequency(SensTqp):
+    return 70e6 / 8 / (SensTqp + 30)
+
+
+def frequency_to_sense_tqp(frequency):
+
+    return 70 * 1e6 / 8 / frequency - 30
+
+
 class HeliosSDK(ItemAttribute):
 
     def __init__(self):
@@ -207,4 +216,3 @@ def SensTqp_to_frequency(SensTqp):
 def frequency_to_SenseTqp(frequency):
 
     return 70 * 1e6 / 8 / frequency - 30
-

pyscan/drivers/heliotis/helioscamera.py

@@ -15,8 +15,7 @@
     print('Path Error' + str(err))
 
 from libHeLIC import LibHeLIC
-from pyscan.general.item_attribute import ItemAttribute
-from .helios_sdk import HeliosSDK
+from .helios_sdk import HeliosSDK, sense_tqp_to_frequency, frequency_to_sense_tqp
 
 
 class HeliosCamera(HeliosSDK):
@@ -125,15 +124,15 @@ def initialize_properties(self):
     @property
     def frequency(self):
 
-        self._frequency = SensTqp_to_frequency(self.internal_tqp)
+        self._frequency = sense_tqp_to_frequency(self.internal_tqp)
         return self._frequency
 
     @frequency.setter
     def frequency(self, x):
 
         if (x >= 2121) and (x <= 291666):
-            self.internal_tqp = int(frequency_to_SenseTqp(x))
-            self._frequency = frequency_to_SenseTqp(self.internal_tqp)
+            self.internal_tqp = int(frequency_to_sense_tqp(x))
+            self._frequency = frequency_to_sense_tqp(self.internal_tqp)
         else:
             print("Bad frequency, must be 2121Hz < f < 291,666 Hz")
 

pyscan/drivers/keysight/exceptions.py

@@ -1,10 +1,11 @@
 from pyscan.general.item_attribute import ItemAttribute
 from ..exceptions.external_package_excpetion import ExternalPackageException
 
+
 class KeysightSD1Error(ItemAttribute):
 
     def __init__(self, *arg, **kwarg):
 
         msg = "Keysight SD1 not found could not load this driver"
 
-        raise ExternalPackageException(msg)
+        raise ExternalPackageException(msg)

pyscan/drivers/keysight/keysightm3302aawg.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
+import keysightSD1
 from pyscan.general.item_attribute import ItemAttribute
 import sys
 sys.path.append(r'c:\Program Files (x86)\Keysight\SD1\Libraries\Python')
-import keysightSD1
 
 
 class KeysightM3302AAWG(ItemAttribute):

pyscan/drivers/spin_core/__init__.py

@@ -1,4 +1,4 @@
 try:
     from .pulse_blaster_esrpro500 import PulseBlasterESRPro500
 except OSError:
-    from .exceptions import SpinAPIException as PulseBlasterESRPro500
+    from .exceptions import SpinAPIException as PulseBlasterESRPro500

pyscan/drivers/spin_core/exceptions.py

@@ -8,4 +8,4 @@ def __init__(self, *arg, **kwarg):
 
         msg = "Spin Core Spin API not found, could not load this driver"
 
-        raise ExternalPackageException(msg)
+        raise ExternalPackageException(msg)