From 072688f1fe9574a56e74f38ec3717b5f3b663b12 Mon Sep 17 00:00:00 2001 From: Hrvoje Stojic Date: Fri, 18 Jan 2019 18:37:51 +0000 Subject: [PATCH 1/3] correct bug in _concatenate_info function Using concatenate_runs = True results in an error as regressor names are missing for session dummy variables, this one-line corrects it. --- nipype/algorithms/modelgen.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nipype/algorithms/modelgen.py b/nipype/algorithms/modelgen.py index 75abd8410b..2f964c103c 100644 --- a/nipype/algorithms/modelgen.py +++ b/nipype/algorithms/modelgen.py @@ -567,6 +567,8 @@ def _concatenate_info(self, infolist): infoout.regressors.insert( len(infoout.regressors), onelist.tolist()[0]) + # insert session regressor name + infoout.regressor_names.extend(['run' + str(i + 1)]) return [infoout], nscans def _generate_design(self, infolist=None): From 7b61f6bab68840c2008efdadd5babb594912a58d Mon Sep 17 00:00:00 2001 From: Hrvoje Stojic Date: Mon, 21 Jan 2019 15:56:17 +0000 Subject: [PATCH 2/3] creating infout.regressor_names list corrected and error in _concatenate_info - when regressor and regressor_names are not defined, the fix fails. Now the regressor_names are created if they were not defined by the user. --- nipype/algorithms/modelgen.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nipype/algorithms/modelgen.py b/nipype/algorithms/modelgen.py index 2f964c103c..d6af1c0f17 100644 --- a/nipype/algorithms/modelgen.py +++ b/nipype/algorithms/modelgen.py @@ -562,6 +562,7 @@ def _concatenate_info(self, infolist): # insert session regressors if not hasattr(infoout, 'regressors') or not infoout.regressors: infoout.regressors = [] + infoout.regressor_names = [] onelist = np.zeros((1, sum(nscans))) onelist[0, sum(nscans[0:i]):sum(nscans[0:(i + 1)])] = 1 infoout.regressors.insert( From 964fc512c9508dae30caf42fe259cac81ffcb4cc Mon Sep 17 00:00:00 2001 From: hstojic Date: Mon, 21 Jan 2019 16:16:31 +0000 Subject: [PATCH 3/3] Added Hrvoje Stojic details to contributors list --- .zenodo.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.zenodo.json b/.zenodo.json index 9fccdcc316..6b0a6843fa 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -589,6 +589,11 @@ "affiliation": "MIT, HMS", "name": "Ghosh, Satrajit", "orcid": "0000-0002-5312-6729" + }, + { + "affiliation": "University College London", + "name": "Stojic, Hrvoje", + "orcid": "0000-0002-9699-9052" } ], "keywords": [