corrected line of modelgen and added test for variable concatenated events

Author: MartinPerez

nipype/algorithms/modelgen.py

@@ -476,7 +476,7 @@ def _concatenate_info(self, infolist):
                                  sum(nscans[0:(i + 1)])
                         infoout.onsets[j].extend(onsets.tolist())
                 for j, val in enumerate(info.durations):
-                    if len(val) > 0:
+                    if len(val):
                         infoout.durations[j].extend(info.durations[j])
                 if hasattr(info, 'amplitudes') and info.amplitudes:
                     for j, val in enumerate(info.amplitudes):
@@ -497,7 +497,7 @@ def _concatenate_info(self, infolist):
             onelist = np.zeros((1, sum(nscans)))
             onelist[0, sum(nscans[0:i]):sum(nscans[0:(i + 1)])] = 1
             infoout.regressors.insert(len(infoout.regressors),
-                                      onelist.tolist()[0])        
+                                      onelist.tolist()[0])
         return [infoout], nscans
 
     def _generate_design(self, infolist=None):

nipype/algorithms/tests/test_modelgen.py

@@ -61,6 +61,7 @@ def test_modelgen_spm_concat():
     filename2 = os.path.join(tempdir, 'test2.nii')
     Nifti1Image(np.random.rand(10, 10, 10, 30), np.eye(4)).to_filename(filename1)
     Nifti1Image(np.random.rand(10, 10, 10, 30), np.eye(4)).to_filename(filename2)
+    # Test case when only one duration is passed, as being the same for all onsets.
     s = SpecifySPMModel()
     s.inputs.input_units = 'secs'
     s.inputs.concatenate_runs = True
@@ -78,23 +79,40 @@ def test_modelgen_spm_concat():
     yield assert_equal, np.sum(res.outputs.session_info[0]['regress'][0]['val']), 30
     yield assert_equal, len(res.outputs.session_info[0]['cond']), 1
     yield assert_almost_equal, np.array(res.outputs.session_info[0]['cond'][0]['onset']), np.array([2.0, 50.0, 100.0, 170.0, 210.0, 220.0, 280.0, 330.0])
+    # Test case of scans as output units instead of seconds
     setattr(s.inputs, 'output_units', 'scans')
     yield assert_equal, s.inputs.output_units, 'scans'
     s.inputs.subject_info = deepcopy(info)
     res = s.run()
     yield assert_almost_equal, np.array(res.outputs.session_info[0]['cond'][0]['onset']), np.array([2.0, 50.0, 100.0, 170.0, 210.0, 220.0, 280.0, 330.0])/6
+    # Test case for no concatenation with seconds as output units
     s.inputs.concatenate_runs = False
     s.inputs.subject_info = deepcopy(info)
     s.inputs.output_units = 'secs'
     res = s.run()
     yield assert_almost_equal, np.array(res.outputs.session_info[0]['cond'][0]['onset']), np.array([2.0, 50.0, 100.0, 170.0])
+    # Test case for variable number of events in separate runs, sometimes unique.
+    filename3 = os.path.join(tempdir, 'test3.nii')
+    Nifti1Image(np.random.rand(10, 10, 10, 30), np.eye(4)).to_filename(filename3)
+    s.inputs.functional_runs = [filename1, filename2, filename3]
     info = [Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2]], durations=[[1, 1], [1]]),
-            Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2, 4]], durations=[[1, 1], [1, 1]])]
+            Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2, 4]], durations=[[1, 1], [1, 1]]),
+            Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2]], durations=[[1, 1], [1]])]
     s.inputs.subject_info = deepcopy(info)
     res = s.run()
     yield assert_almost_equal, np.array(res.outputs.session_info[0]['cond'][0]['duration']), np.array([1., 1.])
     yield assert_almost_equal, np.array(res.outputs.session_info[0]['cond'][1]['duration']), np.array([1.,])
     yield assert_almost_equal, np.array(res.outputs.session_info[1]['cond'][1]['duration']), np.array([1., 1.])
+    yield assert_almost_equal, np.array(res.outputs.session_info[2]['cond'][1]['duration']), np.array([1.,])
+    # Test case for variable number of events in concatenated runs, sometimes unique.
+    s.inputs.concatenate_runs = True
+    info = [Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2]], durations=[[1, 1], [1]]),
+            Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2, 4]], durations=[[1, 1], [1, 1]]),
+            Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 3], [2]], durations=[[1, 1], [1]])]
+    s.inputs.subject_info = deepcopy(info)
+    res = s.run()
+    yield assert_almost_equal, np.array(res.outputs.session_info[0]['cond'][0]['duration']), np.array([1., 1., 1., 1., 1., 1.])
+    yield assert_almost_equal, np.array(res.outputs.session_info[0]['cond'][1]['duration']), np.array([1., 1., 1., 1.])
     rmtree(tempdir)