Som clean merge - #78

Merged

dankessler merged 34 commits into

UMPsychMethodsCore:developfrom

dankessler:som_clean_merge

Jul 12, 2012

Commits on Mar 23, 2012

Fixed some stupid bugs. Thanks Mike for finding them! And also deprecated SOM_read_nii_img and added SOM_readNII.m
rcwelsh
committed
b631503

Commits on Mar 27, 2012

Commits on Mar 29, 2012

Fixed small bug in writing of zmaps to local directory instead of parameters.Output.directory, noted by Mike A.
rcwelsh
committed
50a3638

Commits on Apr 10, 2012

Merge remote-tracking branch 'rcwelsh/som_fixes' into som_batch

mangstad
authored and
dankessler
committed
1e9e088
fixed some typos/bugs

mangstad
authored and
dankessler
committed
54677ed
updated SOM_CreateMask to work with .nii images and SPM8

mangstad
authored and
dankessler
committed
4e392f9
bugfixes on SOM functions

mangstad
authored and
dankessler
committed
b2f9c82
updated mc_central/mc_template - still just testing versions

mangstad
authored and
dankessler
committed
b81a2e8
Merge remote-tracking branch 'mike_verse/som_batch' into som_fixes

rcwelsh
authored and
dankessler
committed
4c55da0
getting som_mc_central ready to test matrix

mangstad
authored and
dankessler
committed
9afc994
Fixed issues with SOM_PreProcessData that would have broken the concatentation of runs.

rcwelsh
authored and
dankessler
committed
53fa3b2
Modification of the API, move .epi, .gray, .white, .csf into parameters.masks, also did a fix to the TIME structure replication.

rcwelsh
authored and
dankessler
committed
eb76db8
Added SOM_MakeGrid and fixed some small comments and output messages

rcwelsh
authored and
dankessler
committed
7acb407
Fixed small bug when a person specifies an empty array for a masking file, the internal flag was not being created and set to zero, that is now done

rcwelsh
authored and
dankessler
committed
20c8011

Commits on Apr 12, 2012

Commits on Apr 17, 2012

Commits on Apr 23, 2012

template / central in beta test state
mangstad
committed
6cf5888

Commits on Apr 24, 2012

template update
mangstad
committed
0d46680
quick format change for image output names
mangstad
committed
b5b6694

Commits on May 8, 2012

fixed 124 in CheckDataStructure
mangstad
committed
e0eecd7

Commits on May 17, 2012

fixed clearing of parameters variable for each subject
mangstad
committed
a93ecb5

Commits on Jun 12, 2012

Fixed small bug with reading a header in SOM_CheckDataStructure.m and changed to 4-digit numeric file name in SOM_CalculateCorrelationImages.m
rcwelsh
committed
41017c7

Commits on Jul 3, 2012

fixed bug in NumScan calculation for missing runs
mangstad
committed
e21aa55

Commits on Jul 12, 2012

Merge remote-tracking branch 'github/rcwelsh/som_cleanup' into exp
dankessler
committed
dc0e9df