Skip to content

Commit ef14ef5

Browse files
oestebanoesteban
authored
Merge branch 'master' into adding_niftyseg
2 parents be7c489 + 38fa3d5 commit ef14ef5

File tree

84 files changed

+4662
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+4662
-224
lines changed

‎.zenodo.json

Lines changed: 336 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,336 @@
1+
{
2+
"creators": [
3+
{
4+
"affiliation": "Department of Psychology, Stanford University",
5+
"name": "Gorgolewski, Krzysztof J.",
6+
"orcid": "0000-0003-3321-7583"
7+
},
8+
{
9+
"affiliation": "Department of Psychology, Stanford University",
10+
"name": "Esteban, Oscar",
11+
"orcid": "0000-0001-8435-6191"
12+
},
13+
{
14+
"name": "Burns, Christopher"
15+
},
16+
{
17+
"affiliation": "Independent",
18+
"name": "Ziegler, Erik",
19+
"orcid": "0000-0003-1857-8129"
20+
},
21+
{
22+
"name": "Pinsard, Basile"
23+
},
24+
{
25+
"name": "Madison, Cindee"
26+
},
27+
{
28+
"affiliation": "Department of Psychology, Stanford University",
29+
"name": "Waskom, Michael"
30+
},
31+
{
32+
"affiliation": "The University of Iowa",
33+
"name": "Ellis, David Gage",
34+
"orcid": "0000-0002-3718-6836"
35+
},
36+
{
37+
"affiliation": "UC Berkeley",
38+
"name": "Clark, Dav",
39+
"orcid": "0000-0002-3982-4416"
40+
},
41+
{
42+
"affiliation": "Shattuck Lab, UCLA Brain Mapping Center",
43+
"name": "Wong, Jason"
44+
},
45+
{
46+
"affiliation": "Mayo Clinic, Neurology, Rochester, MN, USA",
47+
"name": "Dayan, Michael",
48+
"orcid": "0000-0002-2666-0969"
49+
},
50+
{
51+
"affiliation": "Klinikum rechts der Isar, TUM. ACPySS",
52+
"name": "Manh\u00e3es-Savio, Alexandre",
53+
"orcid": "0000-0002-6608-6885"
54+
},
55+
{
56+
"affiliation": "The Laboratory for Investigative Neurophysiology (The LINE), Department of Radiology and Department of Clinical Neurosciences, Lausanne, Switzerland; Center for Biomedical Imaging (CIBM), Lausanne, Switzerland",
57+
"name": "Notter, Michael Philipp",
58+
"orcid": "0000-0002-5866-047X"
59+
},
60+
{
61+
"affiliation": "University of Iowa",
62+
"name": "Johnson, Hans",
63+
"orcid": "0000-0001-9513-2660"
64+
},
65+
{
66+
"affiliation": "Department of Electrical and Computer Engineering, Johns Hopkins University",
67+
"name": "Dewey, Blake E",
68+
"orcid": "0000-0003-4554-5058"
69+
},
70+
{
71+
"affiliation": "Dartmouth College: Hanover, NH, United States",
72+
"name": "Halchenko, Yaroslav O.",
73+
"orcid": "0000-0003-3456-2493"
74+
},
75+
{
76+
"name": "Hamalainen, Carlo",
77+
"orcid": "0000-0001-7655-3830"
78+
},
79+
{
80+
"affiliation": "UC Berkeley - UCSF Graduate Program in Bioengineering",
81+
"name": "Keshavan, Anisha",
82+
"orcid": "0000-0003-3554-043X"
83+
},
84+
{
85+
"affiliation": "Developer",
86+
"name": "Clark, Daniel",
87+
"orcid": "0000-0002-8121-8954"
88+
},
89+
{
90+
"affiliation": "Research Group Neuroanatomy and Connectivity, Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany",
91+
"name": "Huntenburg, Julia M.",
92+
"orcid": "0000-0003-0579-9811"
93+
},
94+
{
95+
"affiliation": "Otto-von-Guericke-University Magdeburg, Germany",
96+
"name": "Hanke, Michael",
97+
"orcid": "0000-0001-6398-6370"
98+
},
99+
{
100+
"affiliation": "SRI International",
101+
"name": "Nichols, B. Nolan",
102+
"orcid": "0000-0003-1099-3328"
103+
},
104+
{
105+
"affiliation": "Athena EPI, Inria Sophia-Antipolis",
106+
"name": "Wassermann , Demian",
107+
"orcid": "0000-0001-5194-6056"
108+
},
109+
{
110+
"affiliation": "University College London",
111+
"name": "Eshaghi, Arman",
112+
"orcid": "0000-0002-6652-3512"
113+
},
114+
{
115+
"affiliation": "Boston University",
116+
"name": "Markiewicz, Christopher J.",
117+
"orcid": "0000-0002-6533-164X"
118+
},
119+
{
120+
"affiliation": "INRIA",
121+
"name": "Varoquaux, Gael",
122+
"orcid": "0000-0003-1076-5122"
123+
},
124+
{
125+
"affiliation": "Washington University in St Louis",
126+
"name": "Acland, Benjamin",
127+
"orcid": "0000-0001-6392-6634"
128+
},
129+
{
130+
"name": "Forbes, Jessica"
131+
},
132+
{
133+
"affiliation": "The University of Washington eScience Institute",
134+
"name": "Rokem, Ariel",
135+
"orcid": "0000-0003-0679-1985"
136+
},
137+
{
138+
"affiliation": "State Key Laboratory of Cognitive Neuroscience and Learning & IDG/McGovern Institute for Brain Research, Beijing Normal University, Beijing, China; Max Planck Institute for Psycholinguistics, Nijmegen, the Netherlands",
139+
"name": "Kong, Xiang-Zhen",
140+
"orcid": "0000-0002-0805-1350"
141+
},
142+
{
143+
"affiliation": "CNRS LTCI, Telecom ParisTech, Universit\u00e9 Paris-Saclay",
144+
"name": "Gramfort, Alexandre",
145+
"orcid": "0000-0001-9791-4404"
146+
},
147+
{
148+
"affiliation": "UniversityHospital Heidelberg, Germany",
149+
"name": "Kleesiek, Jens"
150+
},
151+
{
152+
"affiliation": "National University Singapore",
153+
"name": "Schaefer, Alexander",
154+
"orcid": "0000-0001-6488-4739"
155+
},
156+
{
157+
"affiliation": "Nathan s Kline institute for psychiatric research",
158+
"name": "Sikka, Sharad"
159+
},
160+
{
161+
"affiliation": "Neurospin/Unicog/Inserm/CEA",
162+
"name": "Perez-Guevara, Martin Felipe",
163+
"orcid": "0000-0003-4497-861X"
164+
},
165+
{
166+
"affiliation": "1 McGill Centre for Integrative Neuroscience (MCIN), Ludmer Centre for Neuroinformatics and Mental Health, Montreal Neurological Institute (MNI), McGill University, Montr\u00e9al, 3801 University Street, WB-208, H3A 2B4, Qu\u00e9bec, Canada. 2 University of Lyon, CNRS, INSERM, CREATIS., Villeurbanne, 7, avenue Jean Capelle, 69621, France.",
167+
"name": "Glatard, Tristan",
168+
"orcid": "0000-0003-2620-5883"
169+
},
170+
{
171+
"affiliation": "Duke University",
172+
"name": "Iqbal, Shariq",
173+
"orcid": "0000-0003-2766-8425"
174+
},
175+
{
176+
"affiliation": "The University of Sydney",
177+
"name": "Liu, Siqi"
178+
},
179+
{
180+
"affiliation": "University of Iowa",
181+
"name": "Welch, David"
182+
},
183+
{
184+
"affiliation": "University of illinois urbana champaign",
185+
"name": "Sharp, Paul"
186+
},
187+
{
188+
"affiliation": "Mayo Clinic",
189+
"name": "Warner, Joshua",
190+
"orcid": "0000-0003-3579-4835"
191+
},
192+
{
193+
"affiliation": "Harvard University - Psychology",
194+
"name": "Kastman, Erik",
195+
"orcid": "0000-0001-7221-9042"
196+
},
197+
{
198+
"affiliation": "MPI CBS Leipzig, Germany",
199+
"name": "Lampe, Leonie"
200+
},
201+
{
202+
"affiliation": "Boston University",
203+
"name": "Perkins, L. Nathan"
204+
},
205+
{
206+
"affiliation": "Child Mind Institite",
207+
"name": "Craddock, R. Cameron",
208+
"orcid": "0000-0002-4950-1303"
209+
},
210+
{
211+
"name": "K\u00fcttner, Ren\u00e9"
212+
},
213+
{
214+
"name": "Bielievtsov, Dmytro",
215+
"orcid": "0000-0003-3846-7696"
216+
},
217+
{
218+
"affiliation": "Technische Universit\u00e4t Dresden, Faculty of Medicine, Department of Child and Adolescent Psychiatry",
219+
"name": "Geisler, Daniel",
220+
"orcid": "0000-0003-2076-5329"
221+
},
222+
{
223+
"affiliation": "Institute of Neuroinformatics, ETH/University of Zurich",
224+
"name": "Gerhard, Stephan",
225+
"orcid": "0000-0003-4454-6171"
226+
},
227+
{
228+
"affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany",
229+
"name": "Liem, Franziskus",
230+
"orcid": "0000-0003-0646-4810"
231+
},
232+
{
233+
"affiliation": "German Institute for International Educational Research",
234+
"name": "Linkersd\u00f6rfer, Janosch",
235+
"orcid": "0000-0002-1577-1233"
236+
},
237+
{
238+
"affiliation": "Max Planck Research Group for Neuroanatomy & Connectivity, Max Planck Institute for Human Cognitive and Brain Sciences, Leipzig, Germany",
239+
"name": "Margulies, Daniel S.",
240+
"orcid": "0000-0002-8880-9204"
241+
},
242+
{
243+
"affiliation": "University of Helsinki",
244+
"name": "Andberg, Sami Kristian",
245+
"orcid": "0000-0002-5650-3964"
246+
},
247+
{
248+
"affiliation": "Leibniz Institute for Neurobiology",
249+
"name": "Stadler, J\u00f6rg",
250+
"orcid": "0000-0003-4313-129X"
251+
},
252+
{
253+
"affiliation": "MPI-CBS; McGill University",
254+
"name": "Steele, Christopher John",
255+
"orcid": "0000-0003-1656-7928"
256+
},
257+
{
258+
"affiliation": "Duke University",
259+
"name": "Broderick, William",
260+
"orcid": "0000-0002-8999-9003"
261+
},
262+
{
263+
"affiliation": "UC San Diego",
264+
"name": "Cipollini, Ben",
265+
"orcid": "0000-0002-7782-0790"
266+
},
267+
{
268+
"affiliation": "University of Newcastle, Australia",
269+
"name": "Cooper, Gavin",
270+
"orcid": "0000-0002-7186-5293"
271+
},
272+
{
273+
"affiliation": "The University of Texas at Austin",
274+
"name": "Floren, Andrew",
275+
"orcid": "0000-0003-3618-2056"
276+
},
277+
{
278+
"affiliation": "State Key Laboratory of Cognitive Neuroscience and Learning & IDG/McGovern Institute for Brain Research, Beijing Normal University, Beijing, China",
279+
"name": "Huang, Lijie",
280+
"orcid": "0000-0002-9910-5069"
281+
},
282+
{
283+
"affiliation": "Athinoula A. Martinos Center for Biomedical Imaging, Department of Radiology, Massachusetts General Hospital, Charlestown, MA, USA",
284+
"name": "Gonzalez, Ivan",
285+
"orcid": "0000-0002-6451-6909"
286+
},
287+
{
288+
"affiliation": "University of Cambridge",
289+
"name": "McNamee, Daniel",
290+
"orcid": "0000-0001-9928-4960"
291+
},
292+
{
293+
"affiliation": "CEA",
294+
"name": "Papadopoulos Orfanos, Dimitri",
295+
"orcid": "0000-0002-1242-8990"
296+
},
297+
{
298+
"affiliation": "Child Mind Institute / Nathan Kline Institute",
299+
"name": "Pellman, John",
300+
"orcid": "0000-0001-6810-4461"
301+
},
302+
{
303+
"affiliation": "Department of Psychology, Stanford University",
304+
"name": "Triplett, William",
305+
"orcid": "0000-0002-9546-1306"
306+
},
307+
{
308+
"affiliation": "MIT",
309+
"name": "Goncalves, Mathias"
310+
},
311+
{
312+
"affiliation": "MIT, HMS",
313+
"name": "Ghosh, Satrajit",
314+
"orcid": "0000-0002-5312-6729"
315+
}
316+
],
317+
"keywords": [
318+
"neuroimaging",
319+
"workflow",
320+
"pipeline"
321+
],
322+
"license": "Apache-2.0",
323+
"related_identifiers": [
324+
{
325+
"identifier": "https://github.com/nipy/nipype/tree/0.12.0-rc1",
326+
"relation": "isSupplementTo",
327+
"scheme": "url"
328+
},
329+
{
330+
"identifier": "10.3389/fninf.2011.00013",
331+
"relation": "isNewVersionOf",
332+
"scheme": "doi"
333+
}
334+
],
335+
"upload_type": "software"
336+
}

‎CHANGES

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
Upcoming Release
22
=====================
33

4+
* ENH: AFNI motion parameter support for FrameWiseDisplacement (https://github.com/nipy/nipype/pull/1840)
5+
* ENH: Add ANTs KellyKapowski interface (https://github.com/nipy/nipype/pull/1845)
6+
* FIX: AFNI interface bug setting OMP_NUM_THREADS to 1 (https://github.com/nipy/nipype/pull/1728)
7+
* FIX: Select Eddy run command at runtime (https://github.com/nipy/nipype/pull/1871)
8+
* FIX: Increase FLIRT's flexibility with apply_xfm (https://github.com/nipy/nipype/pull/1875)
9+
* DOC: Update FSL preprocess docstrings (https://github.com/nipy/nipype/pull/1881)
10+
* ENH: Support GIFTI outputs in SampleToSurface (https://github.com/nipy/nipype/pull/1886)
11+
* FIX: Configparser differences between PY2 and PY3 (https://github.com/nipy/nipype/pull/1890)
12+
* ENH: Add mris_expand interface (https://github.com/nipy/nipype/pull/1893)
13+
* FIX: Split over-eager globs in FreeSurferSource (https://github.com/nipy/nipype/pull/1894)
14+
* FIX: Store undefined by default so that xor checks don't trip (https://github.com/nipy/nipype/pull/1903)
15+
* FIX: Gantt chart generator PY3 compatibility (https://github.com/nipy/nipype/pull/1907)
16+
* FIX: Add DOF and --fsl-dof options to BBRegister (https://github.com/nipy/nipype/pull/1917)
17+
* ENH: Auto-derive input_names in Function (https://github.com/nipy/nipype/pull/1918)
18+
* FIX: Minor fixes for NonSteadyStateDetector (https://github.com/nipy/nipype/pull/1926)
19+
* DOC: Add duecredit references for AFNI and FSL (https://github.com/nipy/nipype/pull/1930)
20+
* ENH: Added zenodo (https://zenodo.org/) file (https://github.com/nipy/nipype/pull/1924)
21+
* ENH: Disable symlinks on CIFS filesystems (https://github.com/nipy/nipype/pull/1941)
422
* ENH: Sphinx extension to plot workflows (https://github.com/nipy/nipype/pull/1896)
523
* ENH: Added non-steady state detector for EPI data (https://github.com/nipy/nipype/pull/1839)
624
* ENH: Enable new BBRegister init options for FSv6+ (https://github.com/nipy/nipype/pull/1811)

‎CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* adding more information about what may have caused the error.
2121
Raise a new exception using ``raise_from(NewException("message"), oldException)`` from ``future``.
2222
Do not log this, as it creates redundant/confusing logs.
23+
* If you are new to the project don't forget to add your name and affiliation to the `.zenodo.json` file.
2324

2425
## Contributing issues
2526

‎doc/about.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ Citation
100100
url = {http://dx.doi.org/10.5281/zenodo.50186}
101101
}
102102

103+
If you are a Nipype contributor and your name is not mentioned above please submit
104+
a Pull Request modifying `.zenodo.json` file.
105+
103106
When publishing results obtained using Nipype we strongly encourage citing the above reference to give credit to all
104107
Nipype contributors. However, if for some reason the journal you are publishing with does not allow you do cite software
105108
this way you can use the initial paper published in 2011 (see below).

‎examples/rsfmri_vol_surface_preprocessing_nipy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
from nipype.algorithms.rapidart import ArtifactDetect
6868
from nipype.algorithms.misc import TSNR
69-
from nipype.algorithms.compcor import ACompCor
69+
from nipype.algorithms.confounds import ACompCor
7070
from nipype.interfaces.utility import Rename, Merge, IdentityInterface
7171
from nipype.utils.filemanip import filename_to_list
7272
from nipype.interfaces.io import DataSink, FreeSurferSource
@@ -75,7 +75,7 @@
7575
import numpy as np
7676
import scipy as sp
7777
import nibabel as nb
78-
from nipype.utils import NUMPY_MMAP
78+
from nipype.utils.config import NUMPY_MMAP
7979

8080
imports = ['import os',
8181
'import nibabel as nb',

0 commit comments

Comments
 (0)