Remove blank column in wtk driver retraction curves.
authorW. Trevor King <wking@drexel.edu>
Wed, 2 Jun 2010 04:22:28 +0000 (00:22 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 2 Jun 2010 04:22:28 +0000 (00:22 -0400)
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().

hooke/driver/wtk.py

index c7387ffe1fdcc55388b986718b50074f373ca84e..46bf92e5c57a0a73cd674e71c4e6340a73ece08e 100644 (file)
@@ -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)
             )