Bug fixes in code; First scan was run in the lab off his code

place/automate/osci_card/__init__.py

@@ -11,6 +11,16 @@
 osciCard.controller.__doc__). The remaining modules are used by the
 controller module or are used for testing.
 """
+import os
+constantHeader = '/usr/local/AlazarTech/include/AlazarCmd.h'
+constantFileName = os.path.join(os.path.dirname(__file__), "AlazarCmd.py")
+try:
+    from . import AlazarCmd as cons
+except ImportError:
+    if os.path.isfile(constantHeader):
+        from .parseConstants import parseHeader
+        parseHeader(constantHeader, constantFileName)
+        from . import AlazarCmd as cons
 from .controller import (
         BasicController,
         ContinuousController,

place/automate/osci_card/controller.py

@@ -109,15 +109,14 @@
 
 import numpy as np
 import matplotlib.pyplot as plt
-import os.path
+import os
 
-from os.path import isfile
 constantHeader = '/usr/local/AlazarTech/include/AlazarCmd.h'
 constantFileName = os.path.join(os.path.dirname(__file__), "AlazarCmd.py")
 try:
     from . import AlazarCmd as cons
 except ImportError:
-    if isfile(constantHeader):
+    if os.path.isfile(constantHeader):
         from .parseConstants import parseHeader
         parseHeader(constantHeader, constantFileName)
         from . import AlazarCmd as cons
@@ -356,7 +355,7 @@ def _convertRawDataToInts(self, raw):
         a = len(raw)
         shorts = unpack(str(a) + 'B', raw)
         a = len(shorts)
-        return [(shorts[2 * i + 1] * 256 + shorts[2 * i]) / 4 for i in range(a / 2)]
+        return [(shorts[2 * i + 1] * 256 + shorts[2 * i]) // 4 for i in range(a // 2)]
 
     def _updateChannelCount(self):
         """

place/automate/osci_card/utility.py

@@ -3,10 +3,16 @@
 
 @author: henrik
 '''
+import os
+constantHeader = '/usr/local/AlazarTech/include/AlazarCmd.h'
+constantFileName = os.path.join(os.path.dirname(__file__), "AlazarCmd.py")
 try:
-    import AlazarCmd as cons
+    from . import AlazarCmd as cons
 except ImportError:
-    pass # methods to this module will fail
+    if os.path.isfile(constantHeader):
+        from .parseConstants import parseHeader
+        parseHeader(constantHeader, constantFileName)
+        from . import AlazarCmd as cons
 from functools import reduce
 
 def getNamesOfConstantsThatStartWith(beginning):
@@ -23,30 +29,28 @@ def getValuesOfConstantsThatStartWith(beginning):
 
 def getSampleRateFrom(name):
     """converts a string defining a sample rate to the rate in Hertz."""
-    import string
-    name = string.lstrip(name, "SAMPLE_RATE_")
-    name = string.rstrip(name, "SPS")
+    name = name.lstrip("SAMPLE_RATE_")
+    name = name.rstrip("SPS")
     if name[-1] == "K":
         exponent = 3
-        name = string.rstrip(name, "K")
+        name = name.rstrip("K")
     elif name[-1] == "M": 
         exponent = 6
-        name = string.rstrip(name, "M")
+        name = name.rstrip("M")
     elif name[-1] == "G": 
         exponent = 9
-        name = string.rstrip(name, "G")
+        name = name.rstrip("G")
     return int(name) * 10 ** exponent
 
 def getInputRangeFrom(name):
     """converts a string defining a input range to the range in Volt."""
-    import string
-    name = string.lstrip(name, "INPUT_RANGE_PM_")
-    name = string.rstrip(name, "V")
+    name = name.lstrip("INPUT_RANGE_PM_")
+    name = name.rstrip("V")
     exponent = 0
     if name[-1] == "M":
         exponent = -3
-        name = string.rstrip(name, "M")
-    name = string.rstrip(name, '_')
+        name = name.rstrip("M")
+    name = name.rstrip('_')
     return int(name) * 10 ** exponent
 
 # Author: A.Polino

place/scripts/scan.py

@@ -47,7 +47,6 @@
 # PLACE modules
 import place.automate.osci_card.controller as card
 from place.automate.xps_control.XPS_C8_drivers import XPS
-from place.automate.polytec.vibrometer import Polytec, PolytecDecoder, PolytecSensorHead
 from place.automate.new_focus.picomotor import PMot
 try:
     from place.automate.new_focus.Calibrate import Position, getInverse, get_distance # TODO why does this file not exist in repo?