Ran update_copyright.py.

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

diff --git a/hooke/driver/mfp3d.py b/hooke/driver/mfp3d.py
index 6d2cdc52a61383ad4cff4cc018d12cac0cdd4aec..ced317ba572cbb1d34035c6b12eaf3cc67da9c19 100644 (file)
--- a/hooke/driver/mfp3d.py
+++ b/hooke/driver/mfp3d.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2008-2010 A. Seeholzer
-#                         Alberto Gomez-Casado
-#                         Richard Naud <richard.naud@epfl.ch>
+# Copyright (C) 2008-2012 A. Seeholzer
+#                         Alberto Gomez-Casado <a.gomezcasado@tnw.utwente.nl>
+#                         Richard Naud
 #                         Rolf Schmidt <rschmidt@alcor.concordia.ca>
 #                         W. Trevor King <wking@drexel.edu>
 #
@@ -37,9 +37,8 @@ import pprint
 import numpy
 
 from .. import curve as curve
-from .. import experiment as experiment
+from ..util.igorbinarywave import loadibw
 from . import Driver as Driver
-from .igorbinarywave import loadibw
 
 
 __version__='0.0.0.20100604'
@@ -72,8 +71,6 @@ class MFP3DDriver (Driver):
     def read(self, path, info=None):
         data,bin_info,wave_info = loadibw(path)
         blocks,info = self._translate_ibw(data, bin_info, wave_info)
-        info['filetype'] = self.name
-        info['experiment'] = experiment.VelocityClamp
         return (blocks, info)
      
     def _translate_ibw(self, data, bin_info, wave_info):