Merge pull request #733 from sgiavasis/master

Added 'in_file_c' to the CalcInputSpec of afni/preprocess for secondary operand files.

Author: satra

nipype/interfaces/afni/preprocess.py

@@ -1468,9 +1468,11 @@ class CalcInputSpec(AFNICommandInputSpec):
                      argstr='-a %s', position=0, mandatory=True, exists=True)
     in_file_b = File(desc='operand file to 3dcalc',
                      argstr=' -b %s', position=1, exists=True)
+    in_file_c = File(desc='operand file to 3dcalc',
+                     argstr=' -c %s', position=2, exists=True)
     out_file = File(name_template="%s_calc", desc='output image file name',
                     argstr='-prefix %s', name_source="in_file_a")
-    expr = traits.Str(desc='expr', argstr='-expr "%s"', position=2,
+    expr = traits.Str(desc='expr', argstr='-expr "%s"', position=3,
                       mandatory=True)
     start_idx = traits.Int(desc='start index for in_file_a',
                            requires=['stop_idx'])

nipype/interfaces/afni/tests/test_auto_Calc.py

@@ -11,31 +11,34 @@ def test_Calc_inputs():
     name_template='%s_calc',
     argstr='-prefix %s',
     ),
-    expr=dict(position=2,
+    in_file_a=dict(position=0,
+    mandatory=True,
+    argstr='-a %s',
+    ),
+    expr=dict(position=3,
     mandatory=True,
     argstr='-expr "%s"',
     ),
     args=dict(argstr='%s',
     ),
     outputtype=dict(),
+    start_idx=dict(requires=['stop_idx'],
+    ),
     in_file_b=dict(position=1,
     argstr=' -b %s',
     ),
-    other=dict(argstr='',
+    in_file_c=dict(position=2,
+    argstr=' -c %s',
     ),
-    in_file_a=dict(position=0,
-    mandatory=True,
-    argstr='-a %s',
+    terminal_output=dict(mandatory=True,
+    nohash=True,
     ),
     environ=dict(nohash=True,
     usedefault=True,
     ),
-    single_idx=dict(),
-    start_idx=dict(requires=['stop_idx'],
-    ),
-    terminal_output=dict(mandatory=True,
-    nohash=True,
+    other=dict(argstr='',
     ),
+    single_idx=dict(),
     )
     inputs = Calc.input_spec()