Skip to content

Commit 1fb3bcf

Browse files
Remi-GauRemi-Gau
committed
update after testing
1 parent a1394ff commit 1fb3bcf

File tree

8 files changed

+40
-32
lines changed

8 files changed

+40
-32
lines changed

‎audioLocTranslational.m‎

100644100755
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,16 @@
8585
thisEvent.direction = cfg.design.directions(iBlock, iEvent);
8686
thisEvent.fixationTarget = cfg.design.fixationTargets(iBlock, iEvent);
8787
thisEvent.soundTarget = cfg.design.soundTargets(iBlock, iEvent);
88-
88+
8989
thisEvent.isStim = logFile.isStim;
9090

9191
% we wait for a trigger every 2 events
9292
if cfg.pacedByTriggers.do && mod(iEvent, 2) == 1
9393
waitForTrigger( ...
94-
cfg, ...
95-
cfg.keyboard.responseBox, ...
96-
cfg.pacedByTriggers.quietMode, ...
97-
cfg.pacedByTriggers.nbTriggers);
94+
cfg, ...
95+
cfg.keyboard.responseBox, ...
96+
cfg.pacedByTriggers.quietMode, ...
97+
cfg.pacedByTriggers.nbTriggers);
9898
end
9999

100100
% % % REFACTOR THIS FUNCTION % % %
@@ -119,7 +119,7 @@
119119
% collect the responses and appends to the event structure for
120120
% saving in the tsv file
121121
responseEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
122-
getOnlyPress);
122+
getOnlyPress);
123123

124124
triggerString = ['trigger_' cfg.design.blockNames{iBlock}];
125125
saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString);
@@ -135,7 +135,7 @@
135135

136136
% trigger monitoring
137137
triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
138-
getOnlyPress);
138+
getOnlyPress);
139139

140140
triggerString = 'trigger_baseline';
141141
saveResponsesAndTriggers(triggerEvents, cfg, logFile, triggerString);

‎initEnv.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656

5757
if numel(dir(libDirectory)) <= 2 % Means that the external is empty
5858
error(['Git submodules are not cloned!', ...
59-
'Try this in your terminal:', ...
60-
' git submodule update --recursive ']);
59+
'Try this in your terminal:', ...
60+
' git submodule update --recursive ']);
6161
else
6262
addDependencies();
6363
end

‎input/equateRmsWav.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function runFunction (referenceWavFn, targetWavFn)
5555

5656
% correct for the rms differences in each channel
5757
finalWav = [targetWav(:, 1) * (referenceRMS(1) / targetRms(1)) ...
58-
targetWav(:, 2) * (referenceRMS(2) / targetRms(2))];
58+
targetWav(:, 2) * (referenceRMS(2) / targetRms(2))];
5959

6060
% check that the rms of the final is similar to the original
6161
finalRms = rms(finalWav);

‎setParameters.m‎

100644100755
Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
% setParamters.m file is
1010
% change that if you want the data to be saved somewhere else
1111
cfg.dir.output = fullfile( ...
12-
fileparts(mfilename('fullpath')), 'output');
12+
fileparts(mfilename('fullpath')), 'output');
1313

1414
%% Debug mode settings
1515

@@ -18,11 +18,14 @@
1818
cfg.debug.transpWin = false; % To test with trasparent full size screen
1919

2020
cfg.verbose = 1;
21+
cfg.skipSyncTests = 0;
22+
23+
cfg.audio.devIdx = 3; % 5 %11
2124

2225
%% Engine parameters
2326

2427
cfg.testingDevice = 'mri';
25-
cfg.eyeTracker.do = false;
28+
cfg.eyeTracker.do = true;
2629
cfg.audio.do = true;
2730

2831
cfg = setMonitor(cfg);
@@ -31,7 +34,9 @@
3134
cfg = setKeyboards(cfg);
3235

3336
% MRI settings
37+
3438
cfg = setMRI(cfg);
39+
cfg.suffix.acquisition = '0p75mmEv';
3540

3641
cfg.pacedByTriggers.do = false;
3742

@@ -43,7 +48,7 @@
4348
cfg.design.names = {'static'; 'motion'};
4449
% 0: L--R--L; 180: R--L--R;
4550
cfg.design.motionDirections = [0 180];
46-
cfg.design.nbRepetitions = 14;
51+
cfg.design.nbRepetitions = 21;
4752
cfg.design.nbEventsPerBlock = 6;
4853

4954
%% Timing
@@ -94,7 +99,7 @@
9499

95100
% Instruction
96101
cfg.task.instruction = ['1 - Detect the RED fixation cross\n' ...
97-
'2 - Detected the shorter repeated sounds'];
102+
'2 - Detected the shorter repeated sounds'];
98103

99104
% Fixation cross (in pixels)
100105
cfg.fixation.type = 'cross';
@@ -135,9 +140,9 @@
135140
function cfg = setKeyboards(cfg)
136141
cfg.keyboard.escapeKey = 'ESCAPE';
137142
cfg.keyboard.responseKey = { ...
138-
'r', 'g', 'y', 'b', ...
139-
'd', 'n', 'z', 'e', ...
140-
't'}; % dnze rgyb
143+
'r', 'g', 'y', 'b', ...
144+
'd', 'n', 'z', 'e', ...
145+
't'}; % dnze rgyb
141146
cfg.keyboard.keyboard = [];
142147
cfg.keyboard.responseBox = [];
143148

@@ -155,7 +160,7 @@
155160
cfg.mri.repetitionTime = 1.8;
156161

157162
cfg.bids.MRI.Instructions = ['1 - Detect the RED fixation cross\n' ...
158-
'2 - Detected the shorter repeated sounds'];
163+
'2 - Detected the shorter repeated sounds'];
159164
cfg.bids.MRI.TaskDescription = [];
160165

161166
end

‎subfun/doAuditoryMotion.m‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@
7676
% Get the end time
7777
waitForEndOfPlayback = 1; % hard coding that will need to be moved out
7878
[onset, ~, ~, estStopTime] = PsychPortAudio('Stop', cfg.audio.pahandle, ...
79-
waitForEndOfPlayback);
79+
waitForEndOfPlayback);
8080

8181
duration = estStopTime - onset;

‎subfun/expDesign.m‎

100644100755
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,22 @@
8787
% - targets cannot be on the first or last event of a block
8888

8989
nbTarget = numTargetsForEachBlock(iBlock);
90-
90+
9191
% Fixation targets
9292
forbiddenPositions = [];
9393
chosenPosition = setTargetPositionInSequence( ...
94-
NB_EVENTS_PER_BLOCK, ...
95-
nbTarget, ...
96-
forbiddenPositions);
94+
NB_EVENTS_PER_BLOCK, ...
95+
nbTarget, ...
96+
forbiddenPositions);
9797

9898
fixationTargets(iBlock, chosenPosition) = 1;
9999

100100
% Sound targets
101101
forbiddenPositions = [chosenPosition];
102102
chosenPosition = setTargetPositionInSequence( ...
103-
NB_EVENTS_PER_BLOCK, ...
104-
nbTarget, ...
105-
forbiddenPositions);
103+
NB_EVENTS_PER_BLOCK, ...
104+
nbTarget, ...
105+
forbiddenPositions);
106106

107107
soundTargets(iBlock, chosenPosition) = 1;
108108

@@ -150,8 +150,8 @@
150150
NB_REPEATS_BASE_VECTOR = NB_EVENTS_PER_BLOCK / length(STATIC_DIRECTIONS);
151151

152152
static_directions = repmat( ...
153-
STATIC_DIRECTIONS, ...
154-
1, NB_REPEATS_BASE_VECTOR);
153+
STATIC_DIRECTIONS, ...
154+
1, NB_REPEATS_BASE_VECTOR);
155155

156156
for iMotionBlock = 1:NB_REPETITIONS
157157

‎subfun/saveResponsesAndTriggers.m‎

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ function saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString)
1515
end
1616
end
1717

18+
responseEvents(1).isStim = logFile.isStim;
1819
responseEvents(1).fileID = logFile.fileID;
1920
responseEvents(1).extraColumns = logFile.extraColumns;
2021
saveEventsFile('save', cfg, responseEvents);

‎tests/test_expDesign.m‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ function test_exDesignBasic()
2828

2929
% make sure that we have the right number of blocks of the right length
3030
assertTrue(all(size(cfg.design.directions) == [ ...
31-
cfg.design.nbRepetitions * numel(cfg.design.names), ...
32-
cfg.design.nbEventsPerBlock]));
31+
cfg.design.nbRepetitions * ...
32+
numel(cfg.design.names), ...
33+
cfg.design.nbEventsPerBlock]));
3334

3435
% check that we do not have more than the required number of targets per
3536
% block
@@ -62,8 +63,9 @@ function test_exDesignBasicOtherSetUp()
6263

6364
% make sure that we have the right number of blocks of the right length
6465
assertTrue(all(size(cfg.design.directions) == [ ...
65-
cfg.design.nbRepetitions * numel(cfg.design.names), ...
66-
cfg.design.nbEventsPerBlock]));
66+
cfg.design.nbRepetitions * ...
67+
numel(cfg.design.names), ...
68+
cfg.design.nbEventsPerBlock]));
6769

6870
% check that we do not have more than the required number of targets per
6971
% block

0 commit comments

Comments
 (0)