From 1167db7cf5628f0a8c9f2c7f502bff584676da7d Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 20 Aug 2010 08:12:22 -0400 Subject: [PATCH] Attach raw info etc. to curve in MFP3D driver (used to be just data blocks). --- hooke/driver/mfp3d.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hooke/driver/mfp3d.py b/hooke/driver/mfp3d.py index 5e5c58f..ccffd5e 100644 --- a/hooke/driver/mfp3d.py +++ b/hooke/driver/mfp3d.py @@ -71,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): @@ -108,7 +108,7 @@ class MFP3DDriver (Driver): # MFP3D's native data dimensions match Hooke's (, ) 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` -- 2.26.2