Cleanup

Author: effigies

nipype/interfaces/freesurfer/preprocess.py

@@ -28,7 +28,6 @@
                     Directory, InputMultiPath,
                     OutputMultiPath, CommandLine,
                     CommandLineInputSpec, isdefined)
-from ..traits_extension import DictStrStr
 from .base import (FSCommand, FSTraitedSpec,
                    FSTraitedSpecOpenMP,
                    FSCommandOpenMP, Info)
@@ -943,16 +942,17 @@ def _format_arg(self, name, trait_spec, value):
     @property
     def cmdline(self):
         cmd = super(ReconAll, self).cmdline
+
+        # Adds '-expert' flag if expert flags are passed
+        # Mutually exclusive with 'expert' input parameter
+        cmd += self._prep_expert_file()
+
         if not self._is_resuming():
             return cmd
         subjects_dir = self.inputs.subjects_dir
         if not isdefined(subjects_dir):
             subjects_dir = self._gen_subjects_dir()
 
-        # Adds '-expert' flag if expert flags are passed
-        # Mutually exclusive with 'expert' input parameter
-        cmd += self._prep_expert_file()
-
         no_run = True
         flags = []
         for idx, step in enumerate(self._steps):
@@ -981,11 +981,11 @@ def cmdline(self):
         return cmd
 
     def _prep_expert_file(self):
-        if isdefined(self.inputs.extra):
+        if isdefined(self.inputs.expert):
             return ''
 
         lines = []
-        for binary in binaries:
+        for binary in self._binaries:
             args = getattr(self.inputs, binary)
             if isdefined(args):
                 lines.append('{} {}\n'.format(binary, args))