From: W. Trevor King Date: Fri, 6 Aug 2010 12:43:16 +0000 (-0400) Subject: Use cantilever adjusted extension in polymer fitting. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4de37de61a70efb07a14d6cd4bd8d3d0f8f17ac0;p=hooke.git Use cantilever adjusted extension in polymer fitting. --- diff --git a/hooke/plugin/polymer_fit.py b/hooke/plugin/polymer_fit.py index d5b43db..9ed2faa 100644 --- a/hooke/plugin/polymer_fit.py +++ b/hooke/plugin/polymer_fit.py @@ -973,7 +973,8 @@ Indicies of points bounding the selected data. new.info = copy.deepcopy(data.info) new[:,:-1] = data new.info['columns'].append('%s tension (N)' % model) # TODO: WLC fit for each peak, etc. - z_data = data[:,data.info['columns'].index('surface distance (m)')] + z_data = data[:,data.info['columns'].index( + 'cantilever adjusted extension (m)')] d_data = data[:,data.info['columns'].index('deflection (N)')] start,stop = params['bounds'] tension_data,ps = self.fit_polymer_model(