Added xor option in Camino connectivity for robustness

Author: mick-d

nipype/interfaces/camino/connectivity.py

@@ -35,9 +35,10 @@ class ConmatInputSpec(CommandLineInputSpec):
 
     tract_stat = traits.Enum("mean", "min", "max", "sum", "median", "var", argstr='-tractstat %s', units='NA',
                              desc=("Tract statistic to use. See TractStats for other options."),
-                             requires=['scalar_file'])
+                             requires=['scalar_file'],xor=['tract_prop'])
 
-    tract_prop = traits.Enum("length", "endpointsep", argstr='-tractstat %s', units='NA',
+    tract_prop = traits.Enum("length", "endpointsep", argstr='-tractstat %s', 
+                             units='NA', xor=['tract_stat'],
                              desc=('Tract property average to compute in the connectivity matrix. '
                                    'See TractStats for details.'))
 

nipype/interfaces/camino/tests/test_auto_Conmat.py

@@ -13,28 +13,29 @@ def test_Conmat_inputs():
     ),
     in_file=dict(argstr='-inputfile %s',
     mandatory=True,
-    position=1,
     ),
     output_root=dict(argstr='-outputroot %s',
     genfile=True,
     ),
     scalar_file=dict(argstr='-scalarfile %s',
-    position=3,
     requires=['tract_stat'],
     ),
     target_file=dict(argstr='-targetfile %s',
     mandatory=True,
-    position=2,
     ),
     targetname_file=dict(argstr='-targetnamefile %s',
-    position=4,
     ),
     terminal_output=dict(mandatory=True,
     nohash=True,
     ),
+    tract_prop=dict(argstr='-tractstat %s',
+    units='NA',
+    xor=['tract_stat'],
+    ),
     tract_stat=dict(argstr='-tractstat %s',
     requires=['scalar_file'],
     units='NA',
+    xor=['tract_prop'],
     ),
     )
     inputs = Conmat.input_spec()