Added more connectivity matrix options in Camino interface

Author: mick-d

nipype/interfaces/camino/connectivity.py

@@ -12,22 +12,18 @@
 import os
 
 class ConmatInputSpec(CommandLineInputSpec):
-    in_file = File(exists=True, argstr='-inputfile %s',
-                   mandatory=True, position=1,
+    in_file = File(exists=True, argstr='-inputfile %s', mandatory=True,
                    desc='Streamlines as generated by the Track interface')
 
-    target_file = File(exists=True, argstr='-targetfile %s',
-                       mandatory=True, position=2,
+    target_file = File(exists=True, argstr='-targetfile %s', mandatory=True,
                        desc='An image containing targets, as used in ProcStreamlines interface.')
 
     scalar_file = File(exists=True, argstr='-scalarfile %s',
-                       position=3,
                        desc=('Optional scalar file for computing tract-based statistics. '
                              'Must be in the same space as the target file.'),
                        requires=['tract_stat'])
 
     targetname_file = File(exists=True, argstr='-targetnamefile %s',
-                           position=4,
                            desc=('Optional names of targets. This file should contain one entry per line, '
                                  'with the target intensity followed by the name, separated by white space. '
                                  'For example: '
@@ -41,6 +37,10 @@ class ConmatInputSpec(CommandLineInputSpec):
                              desc=("Tract statistic to use. See TractStats for other options."),
                              requires=['scalar_file'])
 
+    tract_prop = traits.Enum("length", "endpointsep", argstr='-tractstat %s', units='NA',
+                             desc=('Tract property average to compute in the connectivity matrix. '
+                                   'See TractStats for details.'))
+
     output_root = File(argstr='-outputroot %s', genfile=True,
         desc=('filename root prepended onto the names of the output files. '
               'The extension will be determined from the input.'))