Added calibration file support to the JPK driver.

[hooke.git] / hooke / driver / wtk.py

diff --git a/hooke/driver/wtk.py b/hooke/driver/wtk.py
index ec7670d3e896a8e97b43f3051a1a8e31799af531..8cef93947c75f1a217887d0c87a746793d6805b0 100644 (file)
--- a/hooke/driver/wtk.py
+++ b/hooke/driver/wtk.py
@@ -16,7 +16,7 @@
 # License along with Hooke.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-"""Hooke driver for W. Trevor King's velocity clamp data format.
+"""Driver for W. Trevor King's velocity clamp data format.
 
 See my related projects:
 
@@ -81,7 +81,7 @@ class WTKDriver (Driver):
                 return False
         return True
 
-    def read(self, path):
+    def read(self, path, info=None):
         approach_path,retract_path,param_path = self._paths(path)
 
         unlabeled_approach_data = numpy.loadtxt(
@@ -248,7 +248,7 @@ class WTKDriver (Driver):
             if self._calibfile_timestamp(calibfiles[i]) > timestamp:
                 i -= 1
                 break
-        return os.path.join(dir, calibfiles[i])
+        return calibfiles[i]
 
     def _read_cantilever_calibration_file(self, filename):
         ret = {'file': filename}