bugfixes

masonlab · May 11, 2016 · 411a739 · 411a739
1 parent 01fb8cc
commit 411a739
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/labdrivers/oxford/ips120.py b/labdrivers/oxford/ips120.py
@@ -110,7 +110,7 @@ def setActivity(self, state=1):
         """
         assert type(state) == int, 'argument must be integer'
         assert state in [0,1,2,3], 'argument must be one of [0,1,2,3]'
-        self._visa_resource.write("A{}".format(i))
+        self._visa_resource.write("A{}".format(state))
 
 
     def setHeater(self, state=1):
@@ -125,7 +125,7 @@ def setHeater(self, state=1):
         """
         assert type(state) == int, 'argument must be integer'
         assert state in [0,1,2], 'argument must be one of [0,1,2]'
-        self._visa_resource.write("H{}".format(i))
+        self._visa_resource.write("H{}".format(state))
 
         # TODO: add timer to account for time it takes for switch to activate
 
@@ -139,7 +139,7 @@ def setFieldSetpoint(self, field):
         MAX_FIELD = 8
         assert abs(field) < MAX_FIELD, 'field must be less than {}'.format(MAX_FIELD)
 
-        self._visa_resource.write("J{}".format(i))
+        self._visa_resource.write("J{}".format(field))
 
 
     def setFieldSweepRate(self, rate):
@@ -148,7 +148,7 @@ def setFieldSweepRate(self, rate):
         Args:
             rate(float): the magnetic field sweep rate, in Tesla/min
         """
-        self._visa_resource.write("T{}".format(i))
+        self._visa_resource.write("T{}".format(rate))
 
 
     def setDisplay(self, display):

diff --git a/labdrivers/srs/sr830.py b/labdrivers/srs/sr830.py
@@ -104,7 +104,7 @@ def dataTransfer(self, i):
         self._visa_resource.write("FAST {}".format(i))
 
     def queryPoint(self, channel):
-        return ("TRCA ? {}".format(channel))
+        return self._visa_resource.query_ascii_values("TRCA ? {}".format(channel))
 
     def getTimeConst(self):
         const_dict = {0: '10 us',  10: '1 s',