BF: allowing bids_event_file as alternate input

Author: TheChymera

nipype/algorithms/modelgen.py

@@ -233,15 +233,15 @@ class SpecifyModelInputSpec(BaseInterfaceInputSpec):
     subject_info = InputMultiPath(
         Bunch,
         mandatory=True,
-        xor=['subject_info', 'event_files'],
+        xor=['subject_info', 'event_files', 'bids_event_file'],
         desc='Bunch or List(Bunch) subject-specific '
         'condition information. see '
         ':ref:`SpecifyModel` or '
         'SpecifyModel.__doc__ for details')
     event_files = InputMultiPath(
         traits.List(File(exists=True)),
         mandatory=True,
-        xor=['subject_info', 'event_files'],
+        xor=['subject_info', 'event_files', 'bids_event_file'],
         desc='List of event description files 1, 2 or 3 '
         'column format corresponding to onsets, '
         'durations and amplitudes')

nipype/algorithms/tests/test_auto_SpecifyModel.py

@@ -20,7 +20,7 @@ def test_SpecifyModel_inputs():
         ),
         event_files=dict(
             mandatory=True,
-            xor=['subject_info', 'event_files'],
+            xor=['subject_info', 'event_files', 'bids_event_file'],
         ),
         functional_runs=dict(
             copyfile=False,
@@ -33,7 +33,7 @@ def test_SpecifyModel_inputs():
         realignment_parameters=dict(copyfile=False, ),
         subject_info=dict(
             mandatory=True,
-            xor=['subject_info', 'event_files'],
+            xor=['subject_info', 'event_files', 'bids_event_file'],
         ),
         time_repetition=dict(mandatory=True, ),
     )

nipype/algorithms/tests/test_auto_SpecifySPMModel.py

@@ -21,7 +21,7 @@ def test_SpecifySPMModel_inputs():
         concatenate_runs=dict(usedefault=True, ),
         event_files=dict(
             mandatory=True,
-            xor=['subject_info', 'event_files'],
+            xor=['subject_info', 'event_files', 'bids_event_file'],
         ),
         functional_runs=dict(
             copyfile=False,
@@ -35,7 +35,7 @@ def test_SpecifySPMModel_inputs():
         realignment_parameters=dict(copyfile=False, ),
         subject_info=dict(
             mandatory=True,
-            xor=['subject_info', 'event_files'],
+            xor=['subject_info', 'event_files', 'bids_event_file'],
         ),
         time_repetition=dict(mandatory=True, ),
     )

nipype/algorithms/tests/test_auto_SpecifySparseModel.py

@@ -20,7 +20,7 @@ def test_SpecifySparseModel_inputs():
         ),
         event_files=dict(
             mandatory=True,
-            xor=['subject_info', 'event_files'],
+            xor=['subject_info', 'event_files', 'bids_event_file'],
         ),
         functional_runs=dict(
             copyfile=False,
@@ -38,7 +38,7 @@ def test_SpecifySparseModel_inputs():
         stimuli_as_impulses=dict(usedefault=True, ),
         subject_info=dict(
             mandatory=True,
-            xor=['subject_info', 'event_files'],
+            xor=['subject_info', 'event_files', 'bids_event_file'],
         ),
         time_acquisition=dict(mandatory=True, ),
         time_repetition=dict(mandatory=True, ),