Skip to content

Commit adb88da

Browse files
committed
updates after set up in liege
1 parent c542f10 commit adb88da

File tree

4 files changed

+30
-22
lines changed

4 files changed

+30
-22
lines changed

audioLocTranslational.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
% % % REFACTOR THIS FUNCTION % % %
4545

4646
[cfg] = expDesign(cfg);
47+
48+
cfg.design.blockNames
4749

4850
% % % REFACTOR THIS FUNCTION % % %
4951

initEnv.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
function initEnv
1616

1717
octaveVersion = '4.0.3';
18-
matlabVersion = '9.2.0';
18+
matlabVersion = '8.6.0';
1919

2020
if isOctave
2121

@@ -88,7 +88,7 @@ function addDependencies()
8888
pth = fileparts(mfilename('fullpath'));
8989
addpath(genpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src')));
9090
addpath(fullfile(pth, 'lib', 'CPP_PTB'));
91-
addpath(genpath(fullfile(pth, 'lib', 'CPP_PTB', 'src')));
9291
addpath(fullfile(pth, 'subfun'));
92+
addpath(fullfile(pth, 'input'));
9393

9494
end

setParameters.m

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212

1313
%% Debug mode settings
1414

15-
cfg.debug.do = true; % To test the script out of the scanner, skip PTB sync
15+
cfg.debug.do = false; % To test the script out of the scanner, skip PTB sync
1616
cfg.debug.smallWin = false; % To test on a part of the screen, change to 1
17-
cfg.debug.transpWin = true; % To test with trasparent full size screen
17+
cfg.debug.transpWin = false; % To test with trasparent full size screen
1818

1919
cfg.verbose = false;
2020

2121
%% Engine parameters
2222

23-
cfg.testingDevice = 'pc';
24-
cfg.eyeTracker.do = false;
23+
cfg.testingDevice = 'mri';
24+
cfg.eyeTracker.do = true;
2525
cfg.audio.do = true;
2626

2727
cfg = setMonitor(cfg);
@@ -37,10 +37,10 @@
3737
% cfg.design.motionType = 'translation';
3838
% cfg.design.motionType = 'radial';
3939
cfg.design.motionType = 'translation';
40-
cfg.design.names = {'static', 'motion'};
40+
cfg.design.names = {'static'; 'motion'};
4141
cfg.design.possibleDirections = [-1 1]; % 1 motion , -1 static %NOT IN USE AT THE MOMENT
42-
cfg.design.nbBlocks = size(cfg.design.names, 2); % TO CHECK
43-
cfg.design.nbRepetitions = 4; % AT THE MOMENT IT IS NOT SET IN THE MAIN SCRIPT
42+
% cfg.design.nbBlocks = size(cfg.design.names, 2); % TO CHECK
43+
cfg.design.nbRepetitions = 14; % AT THE MOMENT IT IS NOT SET IN THE MAIN SCRIPT
4444
cfg.design.nbEventsPerBlock = 12;
4545

4646
%% Timing
@@ -52,13 +52,13 @@
5252
% block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock
5353

5454
% Time between blocs in secs
55-
cfg.timing.IBI = 1.8 * 3; % 8;
55+
cfg.timing.IBI = 1.8; % 8;
5656
% Time between events in secs
57-
cfg.timing.ISI = 0.1;
57+
cfg.timing.ISI = 0;
5858
% Number of seconds before the motion stimuli are presented
5959
cfg.timing.onsetDelay = .1;
6060
% Number of seconds after the end all the stimuli before ending the run
61-
cfg.timing.endDelay = .1;
61+
cfg.timing.endDelay = 3.6;
6262

6363
%% Auditory Stimulation
6464

@@ -75,12 +75,12 @@
7575
cfg.fixation.type = 'cross';
7676
cfg.fixation.colorTarget = cfg.color.red;
7777
cfg.fixation.color = cfg.color.white;
78-
cfg.fixation.width = 1;
79-
cfg.fixation.lineWidthPix = 2;
78+
cfg.fixation.width = .5;
79+
cfg.fixation.lineWidthPix = 3;
8080
cfg.fixation.xDisplacement = 0;
8181
cfg.fixation.yDisplacement = 0;
8282

83-
cfg.target.maxNbPerBlock = 2;
83+
cfg.target.maxNbPerBlock = 0;
8484
cfg.target.duration = 0.5; % In secs
8585

8686
cfg.extraColumns = {'direction', 'speed', 'target', 'event', 'block', 'keyName'};
@@ -102,14 +102,17 @@
102102
cfg.screen.monitorDistance = 40; % distance from the screen in cm
103103

104104
if strcmpi(cfg.testingDevice, 'mri')
105-
cfg.screen.monitorWidth = 50;
106-
cfg.screen.monitorDistance = 40;
105+
cfg.screen.monitorWidth = 25;
106+
cfg.screen.monitorDistance = 95;
107107
end
108108
end
109109

110110
function cfg = setKeyboards(cfg)
111111
cfg.keyboard.escapeKey = 'ESCAPE';
112-
cfg.keyboard.responseKey = {'space', 't'};
112+
cfg.keyboard.responseKey = {...
113+
'r', 'g', 'y', 'b', ...
114+
'd', 'n', 'z', 'e', ...
115+
't'}; %dnze rgyb
113116
cfg.keyboard.keyboard = [];
114117
cfg.keyboard.responseBox = [];
115118

@@ -122,7 +125,7 @@
122125
function cfg = setMRI(cfg)
123126
% letter sent by the trigger to sync stimulation and volume acquisition
124127
cfg.mri.triggerKey = 't';
125-
cfg.mri.triggerNb = 4;
128+
cfg.mri.triggerNb = 0;
126129

127130
cfg.mri.repetitionTime = 1.8;
128131

subfun/expDesign.m

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,16 @@
5858
% Set variables here for a dummy test of this function
5959
if nargin < 1 || isempty(cfg)
6060
% cfg.design.motionType = 'translation';
61-
cfg.design.motionType = 'radial';
61+
cfg.design.motionType = 'translation';
6262
cfg.design.names = {'static'; 'motion'};
63-
cfg.design.nbRepetitions = 4;
63+
cfg.design.nbRepetitions = 16;
6464
cfg.design.nbEventsPerBlock = 12;
65-
cfg.target.maxNbPerBlock = 2;
65+
cfg.target.maxNbPerBlock = 0;
6666
displayFigs = 1;
6767
end
68+
69+
fprintf('\n\nCreating design.\n\n')
70+
6871

6972
[NB_BLOCKS, NB_REPETITIONS, NB_EVENTS_PER_BLOCK, MAX_TARGET_PER_BLOCK] = getInput(cfg);
7073
[~, STATIC_INDEX, MOTION_INDEX] = assignConditions(cfg);

0 commit comments

Comments
 (0)