Skip to content

Commit 4120833

Browse files
Merge pull request #31 from marcobarilari/marco_update-fix-minor
minor naming update for timing related vars
2 parents 023447d + 05882c2 commit 4120833

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

setParameters.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@
5050
% block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock
5151

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

61-
cfg.eventDuration = 0.8; % second
61+
cfg.timing.eventDuration = 0.8; % second
6262

6363
%% Visual Stimulation
6464

subfun/doDotMo.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
dots = initDots(cfg, thisEvent);
2020

2121
% Set for how many frames this event will last
22-
framesLeft = floor(cfg.eventDuration / cfg.screen.ifi);
22+
framesLeft = floor(cfg.timing.eventDuration / cfg.screen.ifi);
2323

2424
%% Start the dots presentation
2525
vbl = Screen('Flip', cfg.screen.win);

visualLocTanslational.m renamed to visualLocTranslational.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363

6464
disp(cfg);
6565

66+
% Show experiment instruction
6667
standByScreen(cfg);
6768

6869
% prepare the KbQueue to collect responses
@@ -76,7 +77,7 @@
7677

7778
getResponse('start', cfg.keyboard.responseBox);
7879

79-
WaitSecs(cfg.onsetDelay);
80+
WaitSecs(cfg.timing.onsetDelay);
8081

8182
%% For Each Block
8283

@@ -125,13 +126,13 @@
125126
saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString);
126127

127128
% wait for the inter-stimulus interval
128-
WaitSecs(cfg.ISI);
129+
WaitSecs(cfg.timing.ISI);
129130

130131
end
131132

132133
eyeTracker('StopRecordings', cfg);
133134

134-
WaitSecs(cfg.IBI);
135+
WaitSecs(cfg.timing.IBI);
135136

136137
% trigger monitoring
137138
triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
@@ -143,7 +144,7 @@
143144
end
144145

145146
% End of the run for the BOLD to go down
146-
WaitSecs(cfg.endDelay);
147+
WaitSecs(cfg.timing.endDelay);
147148

148149
cfg = getExperimentEnd(cfg);
149150

0 commit comments

Comments
 (0)