[ENH] [FSL-POSSUM] b0calc interface

Author: oesteban

nipype/interfaces/fsl/__init__.py

@@ -31,4 +31,4 @@
                     IsotropicSmooth, TemporalFilter, DilateImage, ErodeImage,
                     SpatialFilter, UnaryMaths, BinaryMaths, MultiImageMaths)
 
-from .possum import (B0Calc)
+from .possum import B0Calc

nipype/interfaces/fsl/possum.py

@@ -2,11 +2,6 @@
 # -*- coding: utf-8 -*-
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
-#
-# @Author: oesteban - [email protected]
-# @Date:   2014-07-03 15:27:53
-# @Last Modified by:   oesteban
-# @Last Modified time: 2014-07-03 17:05:47
 """
 The possum module provides classes for interfacing with `POSSUM
 <http://fsl.fmrib.ox.ac.uk/fsl/fslwiki/POSSUM>`_ command line tools.
@@ -22,14 +17,8 @@
 
 """
 
-import os
-import shutil
-import warnings
-
-from nipype.interfaces.fsl.base import FSLCommand, FSLCommandInputSpec, Info
-from nipype.interfaces.base import (TraitedSpec, isdefined, File, Directory,
-                                    InputMultiPath, OutputMultiPath, traits)
-from nipype.utils.filemanip import fname_presuffix, split_filename, copyfile
+from .base import FSLCommand, FSLCommandInputSpec
+from ..base import TraitedSpec, File, traits
 
 
 class B0CalcInputSpec(FSLCommandInputSpec):
@@ -54,9 +43,10 @@ class B0CalcInputSpec(FSLCommandInputSpec):
     z_b0 = traits.Float(1.0, argstr='--b0=%0.2f', desc=('Value for zeroth-order b0 field '
                         '(z-component), in Tesla'), xor=['xyz_b0'])
 
-    xyz_b0 = traits.Tuple(traits.Float, traits.Float, traits.Float,
-                      argstr='--b0x=%0.2f --b0y=%0.2f --b0=%0.2f', xor=['x_b0','y_b0','z_b0'],
-                      desc='Zeroth-order B0 field in Tesla')
+    xyz_b0 = traits.Tuple(
+        traits.Float, traits.Float, traits.Float,
+        argstr='--b0x=%0.2f --b0y=%0.2f --b0=%0.2f', xor=['x_b0','y_b0','z_b0'],
+        desc='Zeroth-order B0 field in Tesla')
 
     delta = traits.Float(-9.45e-6, argstr='-d %e', desc='Delta value (chi_tissue - chi_air)')
     chi_air = traits.Float(4.0e-7, argstr='--chi0=%e', desc='susceptibility of air')

nipype/interfaces/fsl/tests/test_auto_B0Calc.py

@@ -1,6 +1,7 @@
 # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
-from nipype.testing import assert_equal
-from nipype.interfaces.fsl.possum import B0Calc
+from ....testing import assert_equal
+from ..possum import B0Calc
+
 
 def test_B0Calc_inputs():
     input_map = dict(args=dict(argstr='%s',
@@ -32,34 +33,39 @@ def test_B0Calc_inputs():
     position=1,
     ),
     output_type=dict(),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    terminal_output=dict(nohash=True,
     ),
     x_b0=dict(argstr='--b0x=%0.2f',
+    xor=['xyz_b0'],
     ),
     x_grad=dict(argstr='--gx=%0.4f',
     ),
+    xyz_b0=dict(argstr='--b0x=%0.2f --b0y=%0.2f --b0=%0.2f',
+    xor=['x_b0', 'y_b0', 'z_b0'],
+    ),
     y_b0=dict(argstr='--b0y=%0.2f',
+    xor=['xyz_b0'],
     ),
     y_grad=dict(argstr='--gy=%0.4f',
     ),
     z_b0=dict(argstr='--b0=%0.2f',
+    xor=['xyz_b0'],
     ),
     z_grad=dict(argstr='--gz=%0.4f',
     ),
     )
     inputs = B0Calc.input_spec()
 
-    for key, metadata in input_map.items():
-        for metakey, value in metadata.items():
+    for key, metadata in list(input_map.items()):
+        for metakey, value in list(metadata.items()):
             yield assert_equal, getattr(inputs.traits()[key], metakey), value
 
+
 def test_B0Calc_outputs():
     output_map = dict(out_file=dict(),
     )
     outputs = B0Calc.output_spec()
 
-    for key, metadata in output_map.items():
-        for metakey, value in metadata.items():
+    for key, metadata in list(output_map.items()):
+        for metakey, value in list(metadata.items()):
             yield assert_equal, getattr(outputs.traits()[key], metakey), value
-