added resliced ims to wf output, tweaked registration interface params

Author: kesshijordan

nipype/interfaces/dtitk/registration.py

@@ -47,8 +47,7 @@ class RigidInputSpec(CommandLineInputSpec):
                         desc="cost function tolerance", default_value=0.01,
                         usedefault=True)
     initialize_xfm = File(copyfile=True, desc="Initialize w/DTITK-FORMAT"
-                          "transform ('1' initializes w/existing transform"
-                          "in working directory)", position=5, argstr="%s")
+                          "affine", position=5, argstr="%s", exists=True)
 
 
 class RigidOutputSpec(TraitedSpec):

nipype/interfaces/dtitk/tests/test_auto_Affine.py

@@ -29,7 +29,7 @@ def test_Affine_inputs():
         ),
         initialize_xfm=dict(
             argstr='%s',
-            copyfile=False,
+            copyfile=True,
             position=5,
         ),
         moving_file=dict(

nipype/interfaces/dtitk/tests/test_auto_AffineTask.py

@@ -29,7 +29,7 @@ def test_AffineTask_inputs():
         ),
         initialize_xfm=dict(
             argstr='%s',
-            copyfile=False,
+            copyfile=True,
             position=5,
         ),
         moving_file=dict(

nipype/interfaces/dtitk/tests/test_auto_Rigid.py

@@ -29,7 +29,7 @@ def test_Rigid_inputs():
         ),
         initialize_xfm=dict(
             argstr='%s',
-            copyfile=False,
+            copyfile=True,
             position=5,
         ),
         moving_file=dict(

nipype/interfaces/dtitk/tests/test_auto_RigidTask.py

@@ -29,7 +29,7 @@ def test_RigidTask_inputs():
         ),
         initialize_xfm=dict(
             argstr='%s',
-            copyfile=False,
+            copyfile=True,
             position=5,
         ),
         moving_file=dict(

nipype/workflows/dmri/dtitk/tensor_registration.py

@@ -17,8 +17,7 @@ def affine_tensor_pipeline(name='AffTen'):
     Example
     -------
 
-    >>> from nipype.workflows.dmri.dtitk.tensor_registration import
-     affine_tensor_pipeline
+    >>> from nipype.workflows.dmri.dtitk.tensor_registration import affine_tensor_pipeline
     >>> affine = affine_tensor_pipeline()
     >>> affine.inputs.inputnode.fixed_file = 'im1.nii'
     >>> affine.inputs.inputnode.moving_file = 'im2.nii'
@@ -61,8 +60,7 @@ def diffeomorphic_tensor_pipeline(name='DiffeoTen',
     Example
     -------
 
-    >>> from nipype.workflows.dmri.dtitk.tensor_registration import
-     diffeomorphic_tensor_pipeline
+    >>> from nipype.workflows.dmri.dtitk.tensor_registration import diffeomorphic_tensor_pipeline
     >>> diffeo = diffeomorphic_tensor_pipeline()
     >>> diffeo.inputs.inputnode.fixed_file = 'im1.nii'
     >>> diffeo.inputs.inputnode.moving_file = 'im2.nii'
@@ -74,7 +72,8 @@ def diffeomorphic_tensor_pipeline(name='DiffeoTen',
                         fields=['fixed_file', 'moving_file']),
                         name='inputnode')
     outputnode = pe.Node(niu.IdentityInterface(
-                         fields=['out_file', 'out_file_xfm']),
+                         fields=['out_file', 'out_file_xfm',
+                                 'fixed_resliced', 'moving_resliced']),
                          name='outputnode')
 
     reslice_node_pow2 = pe.Node(dtitk.TVResample(
@@ -122,5 +121,7 @@ def diffeomorphic_tensor_pipeline(name='DiffeoTen',
     # Send to output
     wf.connect(apply_xfm_node, 'out_file', outputnode, 'out_file')
     wf.connect(compose_xfm_node, 'out_file', outputnode, 'out_file_xfm')
+    wf.connect(reslice_node_pow2, 'out_file', outputnode, 'fixed_resliced')
+    wf.connect(reslice_node_moving, 'out_file', outputnode, 'moving_resliced')
 
     return wf