Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9db438f
Merge remote-tracking branch 'upstream/master'
mick-d Oct 15, 2013
a9c41c7
Merge remote-tracking branch 'upstream/master'
mick-d Oct 15, 2013
59d2fd4
AFNI issue
mick-d Oct 19, 2013
5360d04
Merge remote-tracking branch 'upstream/master'
mick-d Oct 19, 2013
930c756
AFNI fixed by latest master
mick-d Oct 19, 2013
9b22a64
New interface for Camino dtshape. Minor correction to Camino ComputeE…
mick-d Oct 27, 2013
25bf37b
Correct PEP8
mick-d Oct 30, 2013
83a925a
Merge remote-tracking branch 'upstream/master' into camino
Nov 9, 2013
e09fc2d
Add header option for camino.dti.DTMetric
mick-d Nov 9, 2013
bf7f5bc
Merge remote-tracking branch 'upstream/master' into camino
mick-d Nov 15, 2013
446118a
Merge remote-tracking branch 'origin/camino' into camino
mick-d Nov 15, 2013
fa9ccdc
Camino update
mick-d Nov 18, 2013
f717526
Merge branch 'camino' of https://github.com/mick-d/nipype into camino
mick-d Nov 18, 2013
26c8280
Commiting again same thing
mick-d Nov 18, 2013
7001996
Merge branch 'camino' of github.com:mick-d/nipype into camino
mick-d Nov 18, 2013
38e1cc4
Merge remote-tracking branch 'upstream/master'
mick-d Nov 18, 2013
ca19159
New interface for Camino dtshape. Minor correction to Camino ComputeE…
mick-d Oct 27, 2013
1af343e
Correct PEP8
mick-d Oct 30, 2013
b22f5cc
Add header option for camino.dti.DTMetric
mick-d Nov 9, 2013
4516073
Camino update
mick-d Nov 18, 2013
508c797
Merge branch 'camino' of github.com:mick-d/nipype into camino
mick-d Nov 18, 2013
fe65593
fix: auto test
satra Nov 19, 2013
6d30d9a
Merge pull request #1 from satra/tst/mike
mick-d Nov 20, 2013
ae52aa8
Autotest file of camino/dti.py DTMetric interface
mick-d Nov 20, 2013
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Commiting again same thing
  • Loading branch information
mick-d committed Nov 18, 2013
commit 26c8280b6e6ec62d83412b908f190bca1c667a57
28 changes: 14 additions & 14 deletions nipype/interfaces/camino/dti.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,56 +66,56 @@ def _gen_outfilename(self):
return name + '_DT.Bdouble'

class DTMetricInputSpec(CommandLineInputSpec):
eigen_data = File(exists=True, argstr='-inputfile %s', mandatory=True,
eigen_data = File(exists=True, argstr='-inputfile %s', mandatory=True,
desc='voxel-order data filename')

metric = traits.Enum('fa','md','rd','l1', 'l2', 'l3', 'tr', 'ra', '2dfa','cl','cp','cs',
argstr='-stat %s', mandatory=True,
desc=('Specifies the metric to compute. Possible choices are: '
'"fa", "md", "rd", "l1", "l2", "l3", "tr", "ra", "2dfa", "cl", "cp" or "cs".'))

inputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
inputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
argstr='-inputdatatype %s', usedefault=True,
desc=('Specifies the data type of the input data. '
'The data type can be any of the following strings: '
'"char", "short", "int", "long", "float" or "double".'
'Default is double data type'))

outputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
outputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
argstr='-outputdatatype %s', usedefault=True,
desc=('Specifies the data type of the output data. '
'The data type can be any of the following strings: '
'"char", "short", "int", "long", "float" or "double".'
'Default is double data type'))

data_header = File(argstr='-header %s', exists=True,
desc=('A Nifti .nii or .nii.gz file containing the header information. '
'Usually this will be the header of the raw data file from which '
'the diffusion tensors were reconstructed.'))

outputfile = File(argstr='-outputfile %s', genfile=True,
desc=('Output name. Output will be a .nii.gz file if data_header is provided and'
'in voxel order with outputdatatype datatype (default: double) otherwise.'))

class DTMetricOutputSpec(TraitedSpec):
metric_stats = File(exists=True, desc='Diffusion Tensor statistics of the chosen metric')

class DTMetric(CommandLine):
"""
Computes tensor metric statistics based on the eigenvalues l1 >= l2 >= l3
typically obtained from ComputeEigensystem.

The full list of statistics is:

<cl> = (l1 - l2) / l1 , a measure of linearity
<cp> = (l2 - l3) / l1 , a measure of planarity
<cs> = l3 / l1 , a measure of isotropy
with: cl + cp + cs = 1
with: cl + cp + cs = 1

<l1> = first eigenvalue
<l2> = second eigenvalue
<l3> = third eigenvalue

<tr> = l1 + l2 + l3
<md> = tr / 3
<rd> = (l2 + l3) / 2
Expand All @@ -129,7 +129,7 @@ class DTMetric(CommandLine):
Example
-------
Compute the CP planar metric as float data type.

>>> import nipype.interfaces.camino as cam
>>> dtmetric = cam.DTMetric()
>>> dtmetric.inputs.eigen_data = 'dteig.Bdouble'
Expand Down Expand Up @@ -793,14 +793,14 @@ class ComputeEigensystemInputSpec(StdOutCommandLineInputSpec):

maxcomponents = traits.Int(argstr='-maxcomponents %d', desc='The maximum number of tensor components in a voxel of the input data.')

inputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
inputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
argstr='-inputdatatype %s', usedefault=True,
desc=('Specifies the data type of the input data. '
'The data type can be any of the following strings: '
'"char", "short", "int", "long", "float" or "double".'
'Default is double data type'))

outputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
outputdatatype = traits.Enum('double', 'float', 'long', 'int', 'short', 'char',
argstr='-outputdatatype %s', usedefault=True,
desc=('Specifies the data type of the output data. '
'The data type can be any of the following strings: '
Expand Down