Skip to content
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.

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

NIDM-Results export #45

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1f56876
Create json structure for nidm export
Mar 14, 2017
4530ddb
Save and load NIDM json from file
Mar 14, 2017
e342f94
Remove special characters from field names
Mar 14, 2017
02d3cd9
first run on test one sample
Mar 14, 2017
ca62a2a
Add permutation terms
Mar 14, 2017
6f06667
fix: statmap inside contrasts
Mar 14, 2017
bbfeef1
Add error models
Mar 16, 2017
628d2d9
testDataDir should be empty
Mar 24, 2017
2a6a777
Add test functions to path when loading SnPM toolbox
Mar 29, 2017
4c0d1c1
Use map rather than struct
Mar 31, 2017
8287c41
Save regressor names to nidm_json
Apr 20, 2017
c2fb4ee
Use map rather than structure for nidm_json
Apr 20, 2017
f5916cf
Save contrast images (and store in nidm_json)
Apr 20, 2017
56306a4
Save contrast std error image
Apr 20, 2017
0d27f51
Cluster forming threshold is height threshold
Apr 20, 2017
038165d
Add missing NIDM info
Apr 20, 2017
3352874
Changes needed to write the grand mean
nicholst Apr 24, 2017
1c7b9ee
Merge remote-tracking branch 'nicholst/WriteGrandMean' into nidm_export
Apr 27, 2017
cb5f43c
Add all files to delete list
Apr 27, 2017
4d10335
Compute grand mean and all images slice-by-slice
Apr 27, 2017
b61ff14
Add nidm_ContrastExplainedMeanSquareMap
Apr 28, 2017
729a523
Save max number of permutations in all modules
Apr 28, 2017
78dbe41
containers to struct
cmaumet Jul 7, 2017
76a20a9
fixes to make all tests pass
cmaumet Jul 7, 2017
b3656ff
Add user-specified info: space, scanner type, groups
cmaumet Jul 7, 2017
04e4ee0
Rename tags in agreement with batch
cmaumet Jul 7, 2017
d87429c
Test results with no NIDM export
cmaumet Jul 7, 2017
cd7a689
Update camel case for OBO and NeuroLex terms
cmaumet Jul 7, 2017
e33f18c
Fix: info now provided by the user in the batch
cmaumet Jul 7, 2017
111b094
More use of camel case for OBO and NeuroLex terms
cmaumet Jul 7, 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
103 changes: 102 additions & 1 deletion config/snpm_bch_pp.m
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,111 @@
'"FDR report" shows the histogram of voxel-wise uncorrected P-values, and the log-log plot of observed P-values versus (null hypothesis) expected P-values. The latter is the basis of the voxel-wise FDR-corrected P-values.'
};

% ---- Export to NIDM, adapted from SPM's spm_cfg_esults
%--------------------------------------------------------------------------
% nsubj Number of subjects
%--------------------------------------------------------------------------
nsubj = cfg_entry;
nsubj.tag = 'nsubj';
nsubj.name = 'Number of subjects';
nsubj.help = {'Number of subjects.'};
nsubj.strtype = 'r';
nsubj.num = [1 1];

%--------------------------------------------------------------------------
% label Label
%--------------------------------------------------------------------------
grplabel = cfg_entry;
grplabel.tag = 'label';
grplabel.name = 'Label';
grplabel.help = {'Group label.'};
grplabel.strtype = 's';
grplabel.num = [0 Inf];

%--------------------------------------------------------------------------
% group
%--------------------------------------------------------------------------
group = cfg_branch;
group.tag = 'group';
group.name = 'Group';
group.val = {nsubj grplabel};
group.help = {['Number of subjects and labels per group. ', ...
'For a single subject analysis, enter "1" and "single subject".']};

%--------------------------------------------------------------------------
% groups
%--------------------------------------------------------------------------
groups = cfg_repeat;
groups.tag = 'groups';
groups.name = 'Groups';
groups.help = {['Number of groups. ', ...
'For a single subject analysis, specify one group.']};
groups.values = {group};
groups.num = [1 Inf];

%--------------------------------------------------------------------------
% modality Modality
%--------------------------------------------------------------------------
modality = cfg_menu;
modality.tag = 'modality';
modality.name = 'Modality';
modality.help = {'Modality.'};
modality.labels = {'Anatomical MRI',...
'Functional MRI',...
'Diffusion MRI',...
'PET',...
'SPECT',...
'EEG',...
'MEG'
}';
modality.values = {'AMRI','FMRI','DMRI','PET','SPECT','EEG','MEG'};

%--------------------------------------------------------------------------
% refspace Reference space
%--------------------------------------------------------------------------
refspace = cfg_menu;
refspace.tag = 'refspace';
refspace.name = 'Reference space';
refspace.help = {['Reference space. For an experiment completed only ',...
'within SPM, choose one of the first four options.']};
refspace.labels = {'Subject space (no normalisation)',...
'Normalised space (using segment)',...
'Normalised space (using old segment)',...
'Customised space',...
'Other normalised MNI space',...
'Other normalised Talairach space',...
}';
refspace.values = {'subject','ixi','icbm','custom','mni','talairach'};

%--------------------------------------------------------------------------
% export Export results to NIDM
%--------------------------------------------------------------------------
export_no = cfg_const;
export_no.tag = 'export_no';
export_no.name = 'No';
export_no.val = {0};
export_no.help = {'Do not export to NIDM.'};


export_nidm = cfg_branch;
export_nidm.tag = 'nidm';
export_nidm.name = 'Export to NIDM';
export_nidm.val = {modality refspace groups};
export_nidm.help = {'NIDM (Neuroimaging Data Model)'};

export = cfg_choice;
export.tag = 'export';
export.name = 'Export results to NIDM';
export.help = {['Export your results to NIDM and share them easily with your collaborators.']};
export.values = {export_nidm, export_no};
export.val = {export_nidm};

% ----

snpmpp = cfg_exbranch;
snpmpp.name = 'Inference';
snpmpp.tag = 'inference';
snpmpp.val = {snpmres ThrType posneg WrtFilt Report};
snpmpp.val = {snpmres ThrType posneg WrtFilt Report export};
snpmpp.prog = @snpm_run_pp;
%snpmpp.vout
snpmpp.help = {'Examine the results of the SnPM computation.'};
Expand Down
Loading