Skip to content

Commit 2d1adfb

Browse files
committed
update submodules and adapt code
1 parent f16bcff commit 2d1adfb

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

lib/CPP_BIDS

Submodule CPP_BIDS updated 117 files

lib/CPP_PTB

Submodule CPP_PTB updated 92 files

subfun/preSaveSetup.m

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,14 @@
1515
thisEvent.onset = onset - cfg.experimentStart;
1616
thisEvent.fixationPosition = thisFixation.fixation.xDisplacement;
1717
thisEvent.aperturePosition = cfg.aperture.xPos * sign(cfg.aperture.xPosPix);
18+
19+
thisEvent = pixToDeg('speedPix', thisEvent, cfg);
20+
thisEvent.speedDegVA = thisEvent.speedDegVA * cfg.screen.monitorRefresh;
1821

19-
% % this value should be in degrees / second in the log file
20-
% % highlights that the way speed is passed around could be
21-
% % simplified.
22-
% %
23-
% thisEvent.speed
24-
% %
25-
22+
2623
% Save the events txt logfile
2724
% we save event by event so we clear this variable every loop
25+
thisEvent.isStim = logFile.isStim;
2826
thisEvent.fileID = logFile.fileID;
2927
thisEvent.extraColumns = logFile.extraColumns;
3028

subfun/preTrialSetup.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
% set direction, speed of that event and if it is a target
1111
thisEvent.trial_type = cfg.design.blockNames{iBlock};
1212
thisEvent.direction = cfg.design.directions(iBlock, iEvent);
13-
thisEvent.speed = cfg.design.speeds(iBlock, iEvent);
13+
thisEvent.speedPix = cfg.design.speeds(iBlock, iEvent);
1414
thisEvent.target = cfg.design.fixationTargets(iBlock, iEvent);
1515

1616
% If this frame shows a target we change the color of the cross

visualMotionLocalizer.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
% Prepare for the output logfiles with all
4444
logFile.extraColumns = cfg.extraColumns;
45+
logFile = saveEventsFile('init', cfg, logFile);
4546
logFile = saveEventsFile('open', cfg, logFile);
4647

4748
% prepare textures

0 commit comments

Comments
 (0)