moving itername and _id from Node to EngineBase

Author: djarecka

nipype/pipeline/engine/base.py

@@ -41,6 +41,7 @@ def __init__(self, name=None, base_dir=None):
         self.base_dir = base_dir
         self.config = deepcopy(config._sections)
         self.name = name
+        self._id = self.name # for compatibility with node expansion using iterables
 
     @property
     def name(self):
@@ -66,6 +67,14 @@ def inputs(self):
     def outputs(self):
         raise NotImplementedError
 
+    @property
+    def itername(self):
+        """Name for expanded iterable"""
+        itername = self._id
+        if self._hierarchy:
+            itername = '%s.%s' % (self._hierarchy, self._id)
+        return itername
+
     def clone(self, name):
         """Clone an EngineBase object
 

nipype/pipeline/engine/nodes.py

@@ -159,7 +159,6 @@ def __init__(self,
         self._got_inputs = False
         self._originputs = None
         self._output_dir = None
-        self._id = self.name  # for compatibility with node expansion using iterables
 
         self.iterables = iterables
         self.synchronize = synchronize
@@ -249,14 +248,6 @@ def n_procs(self, value):
         if hasattr(self._interface.inputs, 'num_threads'):
             self._interface.inputs.num_threads = self._n_procs
 
-    @property
-    def itername(self):
-        """Name for expanded iterable"""
-        itername = self._id
-        if self._hierarchy:
-            itername = '%s.%s' % (self._hierarchy, self._id)
-        return itername
-
     def output_dir(self):
         """Return the location of the output directory for the node"""
         # Output dir is cached