Skip to content

Commit

Permalink
Merge pull request #32 from Remi-Gau/remi-dev
Browse files Browse the repository at this point in the history
I took two of the commits from Remi's branch, regarding `websave` and hard-coded design information.
For the other two regarding the line separator issue, I found that I had uncommited code changes which replaced `strsplit`/`strtrim` by `arrayfun`.
  • Loading branch information
allefeld authored Oct 11, 2019
2 parents 274f888 + 4756e33 commit 7d285b9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
5 changes: 5 additions & 0 deletions cvManovaTest/cvManovaTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@

clear

% design information
TR = 2.5;
nRuns = 12;
nVolsPerRun = 121;

% select subject
sub = 'subj1';
fprintf('analyzing data of %s from Haxby et al. (2001)\n', sub)
Expand Down
6 changes: 1 addition & 5 deletions cvManovaTest/cvManovaTest_getdata.m
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

if ~exist(fn, 'file')
fprintf('downloading %s\n', fn)
websave(fn, url);
urlwrite(url, fn);
end

fprintf('unpacking %s\n', fn)
Expand All @@ -24,10 +24,6 @@
% make sure design information is there
fnDesign = [sub filesep 'design.mat'];
if ~exist(fnDesign, 'file')
% other design information
TR = 2.5;
nRuns = 12;
nVolsPerRun = 121;
% extract stimulus information
fnLabels = [sub filesep 'labels.txt'];
fprintf('extracting stimulus timing information from %s\n', fnLabels)
Expand Down
3 changes: 1 addition & 2 deletions cvManovaTest/cvManovaTest_model.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
load(fnDesign);
V = spm_vol(fnBOLD); % for motion parameters
mat = cat(4, V.mat);
mkdir(modelDir)

mkdir(modelDir)
fmri_spec = struct;
fmri_spec.dir = {modelDir};
fmri_spec.timing.units = 'secs';
Expand Down

0 comments on commit 7d285b9

Please sign in to comment.