From: W. Trevor King <wking@drexel.edu>
Date: Sun, 8 Aug 2010 20:09:40 +0000 (-0400)
Subject: Use .run vs. old ._run in vclamp.scale() to normalize params
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e85381cd5a6f6d18a526d39e4ebb95fcf9b723c6;p=hooke.git

Use .run vs. old ._run in vclamp.scale() to normalize params
---

diff --git a/hooke/plugin/vclamp.py b/hooke/plugin/vclamp.py
index 40c1ecb..90acc97 100644
--- a/hooke/plugin/vclamp.py
+++ b/hooke/plugin/vclamp.py
@@ -65,14 +65,14 @@ def scale(hooke, curve, block=None):
         if ('surface distance (m)' not in b.info['columns']
             or 'surface adjusted deflection (m)' not in b.info['columns']):
             try:
-                contact._run(hooke, inqueue, outqueue, params)
+                contact.run(hooke, inqueue, outqueue, **params)
             except PoorFit, e:
                 raise PoorFit('Could not fit %s %s: %s'
                               % (curve.path, block, str(e)))
         if ('deflection (N)' not in b.info['columns']):
-            force._run(hooke, inqueue, outqueue, params)
+            force.run(hooke, inqueue, outqueue, **params)
         if ('cantilever adjusted extension (m)' not in b.info['columns']):
-            cant_adjust._run(hooke, inqueue, outqueue, params)
+            cant_adjust.run(hooke, inqueue, outqueue, **params)
     return curve
 
 class SurfacePositionModel (ModelFitter):