Skip to content

Commit db8c02b

Browse files
committed
mh fix
1 parent 6a79476 commit db8c02b

File tree

7 files changed

+39
-37
lines changed

7 files changed

+39
-37
lines changed

initEnv.m

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

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

setParameters.m

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

1717
%% Debug mode settings
1818

@@ -150,23 +150,23 @@
150150
cfg.target.duration = 0.05; % In secs
151151

152152
cfg.extraColumns = { ...
153-
'direction', ...
154-
'speed', ...
155-
'target', ...
156-
'event', ...
157-
'block', ...
158-
'keyName', ...
159-
'fixationPosition', ...
160-
'aperturePosition'};
153+
'direction', ...
154+
'speed', ...
155+
'target', ...
156+
'event', ...
157+
'block', ...
158+
'keyName', ...
159+
'fixationPosition', ...
160+
'aperturePosition'};
161161

162162
end
163163

164164
function cfg = setKeyboards(cfg)
165165
cfg.keyboard.escapeKey = 'ESCAPE';
166166
cfg.keyboard.responseKey = { ...
167-
'r', 'g', 'y', 'b', ...
168-
'd', 'n', 'z', 'e', ...
169-
't'};
167+
'r', 'g', 'y', 'b', ...
168+
'd', 'n', 'z', 'e', ...
169+
't'};
170170
cfg.keyboard.keyboard = [];
171171
cfg.keyboard.responseBox = [];
172172

subfun/expDesign.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494
nbTarget = numTargetsForEachBlock(iBlock);
9595

9696
chosenPosition = setTargetPositionInSequence( ...
97-
NB_EVENTS_PER_BLOCK, ...
98-
nbTarget, ...
99-
[1 NB_EVENTS_PER_BLOCK]);
97+
NB_EVENTS_PER_BLOCK, ...
98+
nbTarget, ...
99+
[1 NB_EVENTS_PER_BLOCK]);
100100

101101
fixationTargets(iBlock, chosenPosition) = 1;
102102

subfun/postInitializationSetup.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
% dots are displayed on a square with a length in visual angle equal to the
2323
% field of view
2424
cfg.dot.number = round(cfg.dot.density * ...
25-
(cfg.dot.matrixWidth / cfg.screen.ppd)^2);
25+
(cfg.dot.matrixWidth / cfg.screen.ppd)^2);
2626

2727
varargout = {cfg};
2828

subfun/setDirections.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
NB_REPEATS_BASE_VECTOR = NB_EVENTS_PER_BLOCK / length(CONDITION2_DIRECTIONS);
2020

2121
static_directions = repmat( ...
22-
CONDITION2_DIRECTIONS, ...
23-
1, NB_REPEATS_BASE_VECTOR);
22+
CONDITION2_DIRECTIONS, ...
23+
1, NB_REPEATS_BASE_VECTOR);
2424

2525
for iMotionBlock = 1:NB_REPETITIONS
2626

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

visualLocTranslational.m

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,28 +85,28 @@
8585
% we wait for a trigger every 2 events
8686
if cfg.pacedByTriggers.do && mod(iEvent, 2) == 1
8787
waitForTrigger( ...
88-
cfg, ...
89-
cfg.keyboard.responseBox, ...
90-
cfg.pacedByTriggers.quietMode, ...
91-
cfg.pacedByTriggers.nbTriggers);
88+
cfg, ...
89+
cfg.keyboard.responseBox, ...
90+
cfg.pacedByTriggers.quietMode, ...
91+
cfg.pacedByTriggers.nbTriggers);
9292
end
9393

9494
% play the dots and collect onset and duraton of the event
9595
[onset, duration] = doDotMo(cfg, thisEvent, thisFixation);
9696

9797
thisEvent = preSaveSetup( ...
98-
thisEvent, ...
99-
thisFixation, ...
100-
iBlock, iEvent, ...
101-
duration, onset, ...
102-
cfg, ...
103-
logFile);
98+
thisEvent, ...
99+
thisFixation, ...
100+
iBlock, iEvent, ...
101+
duration, onset, ...
102+
cfg, ...
103+
logFile);
104104
saveEventsFile('save', cfg, thisEvent);
105105

106106
% collect the responses and appends to the event structure for
107107
% saving in the tsv file
108108
responseEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
109-
getOnlyPress);
109+
getOnlyPress);
110110

111111
triggerString = ['trigger_' cfg.design.blockNames{iBlock}];
112112
saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString);
@@ -132,7 +132,7 @@
132132

133133
% trigger monitoring
134134
triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
135-
getOnlyPress);
135+
getOnlyPress);
136136

137137
triggerString = 'trigger_baseline';
138138
saveResponsesAndTriggers(triggerEvents, cfg, logFile, triggerString);

0 commit comments

Comments
 (0)