Updated imalcolm to use vds-gen directly

dls-controls · Nov 8, 2017 · e7cf3b5 · e7cf3b5
1 parent f0ccb57
commit e7cf3b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/malcolm/imalcolm.py b/malcolm/imalcolm.py
@@ -288,7 +288,7 @@ def main():
     #sys.path.insert(0,
     #                "/dls_sw/work/tools/RHEL6-x86_64/odin/venv/lib/python2.7/"
     #                "site-packages")
-    require("tornado", "numpy", "ruamel.yaml", "cothread==2.14",
+    require("tornado", "numpy", "ruamel.yaml", "cothread==2.14", "vdsgen==0.2",
             "pygelf==0.3.1", "scanpointgenerator", "plop", "h5py==2.7.1")
     #sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "cothread"))
     #sys.path.append(

diff --git a/malcolm/modules/excalibur/parts/vdswrapperpart.py b/malcolm/modules/excalibur/parts/vdswrapperpart.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 import h5py as h5
-from vdsgen import SubFrameVDSGenerator
+from vdsgen.subframevdsgenerator import SubFrameVDSGenerator
 
 from malcolm.modules.scanning.controllers import RunnableController
 from malcolm.core import method_takes, REQUIRED, Part
@@ -135,8 +135,7 @@ def configure(self, context, completed_steps, steps_to_do, part_info,
                                     fillvalue=np.nan)
         files = [params.fileTemplate % self.RAW_FILE_TEMPLATE.format(fem)
                  for fem in self.fems]
-        shape = [str(d) for d in params.generator.shape] + \
-                [str(self.stripe_height), str(self.stripe_width)]
+        shape = params.generator.shape + (self.stripe_height, self.stripe_width)
 
         # Create the VDS using vdsgen
         fgen = SubFrameVDSGenerator(