Merge pull request #16 from chrisfilo/enh/rapidart

Code cleanup.

Author: satra

nipype/algorithms/rapidart.py

@@ -287,7 +287,7 @@ def _get_output_filenames(self, motionfile, output_dir):
             infile = motionfile[0]
         else:
             raise Exception("Unknown type of file")
-        filepath, filename, ext = split_filename(infile)
+        _, filename, ext = split_filename(infile)
         artifactfile = os.path.join(output_dir, ''.join(('art.', filename,
                                                          '_outliers.txt')))
         intensityfile = os.path.join(output_dir, ''.join(('global_intensity.',
@@ -594,8 +594,8 @@ def _get_output_filenames(self, motionfile, output_dir):
         output_dir: string
             output directory in which the files will be generated
         """
-        (filepath, filename) = os.path.split(motionfile)
-        (filename, ext) = os.path.splitext(filename)
+        (_, filename) = os.path.split(motionfile)
+        (filename, _) = os.path.splitext(filename)
         corrfile = os.path.join(output_dir, ''.join(('qa.', filename,
                                                      '_stimcorr.txt')))
         return corrfile
@@ -655,7 +655,7 @@ def _run_interface(self, runtime):
         intensityfiles = self.inputs.intensity_values
         spmmat = sio.loadmat(self.inputs.spm_mat_file, struct_as_record=False)
         nrows = []
-        for i, imgf in enumerate(motparamlist):
+        for i in range(len(motparamlist)):
             sessidx = i
             rows = None
             if self.inputs.concatenated_design:

nipype/algorithms/tests/test_rapidart.py

@@ -62,7 +62,6 @@ def test_ad_output_filenames():
 
 
 def test_ad_get_affine_matrix():
-    ad = ra.ArtifactDetect()
     matrix = ra._get_affine_matrix(np.array([0]), 'SPM')
     yield assert_equal, matrix, np.eye(4)
     # test translation
@@ -89,7 +88,6 @@ def test_ad_get_affine_matrix():
 
 
 def test_ad_get_norm():
-    ad = ra.ArtifactDetect()
     params = np.array([0, 0, 0, 0, 0, 0, 0, 0, 0, np.pi / 4, np.pi / 4,
                        np.pi / 4, 0, 0, 0, -np.pi / 4,
                        -np.pi / 4, -np.pi / 4]).reshape((3, 6))