Use .run vs. old ._run in vclamp.scale() to normalize params
authorW. Trevor King <wking@drexel.edu>
Sun, 8 Aug 2010 20:09:40 +0000 (16:09 -0400)
committerW. Trevor King <wking@drexel.edu>
Sun, 8 Aug 2010 20:09:40 +0000 (16:09 -0400)
hooke/plugin/vclamp.py

index 40c1ecb543b20a697768e6b20171271d1780e117..90acc976ff30465828605d36c3c98291bf50405d 100644 (file)
@@ -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):