From: W. Trevor King <wking@drexel.edu>
Date: Wed, 2 Jun 2010 04:22:28 +0000 (-0400)
Subject: Remove blank column in wtk driver retraction curves.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=68794cc9ad86dc92c8b58b1b10ad3a9dc1236b41;p=hooke.git

Remove blank column in wtk driver retraction curves.

The old implentation reserved space for the z piezo input column, but
never filled it in or added the relevant entry to info['columns'].
This caused some column indexing confusion in vclamp.scale().
---

diff --git a/hooke/driver/wtk.py b/hooke/driver/wtk.py
index c7387ff..46bf92e 100644
--- a/hooke/driver/wtk.py
+++ b/hooke/driver/wtk.py
@@ -156,7 +156,7 @@ class WTKDriver (Driver):
         array in SI units.
         """
         ret = curve.Data(
-            shape=data.shape,
+            shape=(data.shape[0], 2),
             dtype=numpy.float,
             info=copy.deepcopy(info)
             )