Skip to content

[DOC] Improve readability of modelgen examples. #1882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 16, 2017
Merged

[DOC] Improve readability of modelgen examples. #1882

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ffdc91
Merge pull request #1 from nipy/master
tsalo Feb 23, 2017
f785fac
Merge remote-tracking branch 'nipy/master'
tsalo Mar 10, 2017
27b0383
Merge remote-tracking branch 'nipy/master'
tsalo Mar 11, 2017
60c42e9
Merge remote-tracking branch 'nipy/master'
tsalo Mar 14, 2017
7072042
Improve readability of modelgen examples.
tsalo Mar 14, 2017
1e50c12
Fix whitespace in a way that actually works.
tsalo Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions nipype/algorithms/modelgen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,22 +261,18 @@ class SpecifyModel(BaseInterface):
>>> s.inputs.functional_runs = ['functional2.nii', 'functional3.nii']
>>> s.inputs.time_repetition = 6
>>> s.inputs.high_pass_filter_cutoff = 128.
>>> info = [Bunch(conditions=['cond1'], onsets=[[2, 50, 100, 180]],\
durations=[[1]]), \
Bunch(conditions=['cond1'], onsets=[[30, 40, 100, 150]], \
durations=[[1]])]
>>> info = [Bunch(conditions=['cond1'], onsets=[[2, 50, 100, 180]], \
durations=[[1]]), Bunch(conditions=['cond1'], onsets=[[30, 40, 100, 150]], \
durations=[[1]])]
>>> s.inputs.subject_info = info

Using pmod:

>>> info = [Bunch(conditions=['cond1', 'cond2'], \
onsets=[[2, 50],[100, 180]], durations=[[0],[0]], \
pmod=[Bunch(name=['amp'], poly=[2], param=[[1, 2]]),\
None]), \
Bunch(conditions=['cond1', 'cond2'], \
onsets=[[20, 120],[80, 160]], durations=[[0],[0]], \
pmod=[Bunch(name=['amp'], poly=[2], param=[[1, 2]]), \
None])]
>>> info = [Bunch(conditions=['cond1', 'cond2'], onsets=[[2, 50],[100, 180]], \
durations=[[0],[0]], pmod=[Bunch(name=['amp'], poly=[2], param=[[1, 2]]), \
None]), Bunch(conditions=['cond1', 'cond2'], onsets=[[20, 120],[80, 160]], \
durations=[[0],[0]], pmod=[Bunch(name=['amp'], poly=[2], param=[[1, 2]]), \
None])]
>>> s.inputs.subject_info = info

"""
Expand Down Expand Up @@ -443,9 +439,8 @@ class SpecifySPMModel(SpecifyModel):
>>> s.inputs.time_repetition = 6
>>> s.inputs.concatenate_runs = True
>>> info = [Bunch(conditions=['cond1'], onsets=[[2, 50, 100, 180]], \
durations=[[1]]), \
Bunch(conditions=['cond1'], onsets=[[30, 40, 100, 150]], \
durations=[[1]])]
durations=[[1]]), Bunch(conditions=['cond1'], onsets=[[30, 40, 100, 150]], \
durations=[[1]])]
>>> s.inputs.subject_info = info

"""
Expand Down Expand Up @@ -609,9 +604,8 @@ class SpecifySparseModel(SpecifyModel):
>>> s.inputs.high_pass_filter_cutoff = 128.
>>> s.inputs.model_hrf = True
>>> info = [Bunch(conditions=['cond1'], onsets=[[2, 50, 100, 180]], \
durations=[[1]]), \
Bunch(conditions=['cond1'], onsets=[[30, 40, 100, 150]], \
durations=[[1]])]
durations=[[1]]), Bunch(conditions=['cond1'], onsets=[[30, 40, 100, 150]], \
durations=[[1]])]
>>> s.inputs.subject_info = info

"""
Expand Down