Attach raw info etc. to curve in MFP3D driver (used to be just data blocks).

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

diff --git a/hooke/driver/mfp3d.py b/hooke/driver/mfp3d.py
index 63c1a28ed7f7f5b74e06d0d4fc19278c5218cf98..ccffd5e8de798f1e7afb1d9fa9db6e5f00ae394b 100644 (file)
--- a/hooke/driver/mfp3d.py
+++ b/hooke/driver/mfp3d.py
@@ -31,6 +31,7 @@ Hooke submission: Rolf Schmidt, Alberto Gomez-Casado 2009
 """
 
 import copy
+import os.path
 import pprint
 
 import numpy
@@ -53,6 +54,8 @@ class MFP3DDriver (Driver):
     def is_me(self, path):
         """Look for identifying fields in the IBW note.
         """
+        if os.path.isdir(path):
+            return False
         if not path.endswith('.ibw'):
             return False
         targets = ['Version:', 'XOPVersion:', 'ForceNote:']
@@ -68,9 +71,9 @@ class MFP3DDriver (Driver):
     
     def read(self, path, info=None):
         data,bin_info,wave_info = loadibw(path)
-        approach,retract = self._translate_ibw(data, bin_info, wave_info)
-
-        info = {'filetype':self.name, 'experiment':experiment.VelocityClamp}
+        approach,retract,info = self._translate_ibw(data, bin_info, wave_info)
+        info['filetype'] = self.name
+        info['experiment'] = experiment.VelocityClamp
         return ([approach, retract], info)
      
     def _translate_ibw(self, data, bin_info, wave_info):
@@ -105,7 +108,7 @@ class MFP3DDriver (Driver):
         # MFP3D's native data dimensions match Hooke's (<point>, <column>) layout.
         approach = self._scale_block(data[:wave_info['npnts']/2,:], info, 'approach')
         retract = self._scale_block(data[wave_info['npnts']/2:,:], info, 'retract')
-        return (approach, retract)
+        return (approach, retract, info)
 
     def _scale_block(self, data, info, name):
         """Convert the block from its native format to a `numpy.float`