Skip to content

Commit 2aae343

Browse files
committed
update names in expDesign
1 parent aee8afe commit 2aae343

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

subfun/expDesign.m

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
% - 0 90 180 270 indicate the angle
3030
% - -1 indicates static
3131
%
32-
% - ExpParameters.designSpeeds = array (nr_blocks, numEventsPerBlock) * speedEvent
3332
%
3433
% - ExpParameters.designFixationTargets = array (nr_blocks, numEventsPerBlock)
3534
% showing for each event if it should be accompanied by a target
@@ -48,11 +47,10 @@
4847

4948
% Set variables here for a dummy test of this function
5049
if nargin < 1 || isempty(cfg)
51-
cfg.names = {'static', 'motion'};
52-
cfg.numRepetitions = 4;
53-
cfg.speedEvent = 4;
54-
cfg.numEventsPerBlock = 12;
55-
cfg.maxNumFixationTargetPerBlock = 2;
50+
cfg.design.names = {'static', 'motion'};
51+
cfg.design.numRepetitions = 4;
52+
cfg.design.nbEventsPerBlock = 12;
53+
cfg.target.maxNbPerBlock = 2;
5654
end
5755

5856
% Set to 1 for a visualtion of the trials design order
@@ -61,10 +59,9 @@
6159
end
6260

6361
% Get the parameters
64-
names = cfg.names;
65-
numRepetitions = cfg.numRepetitions;
66-
speedEvent = cfg.speedEvent;
67-
numEventsPerBlock = cfg.numEventsPerBlock;
62+
names = cfg.design.names;
63+
numRepetitions = cfg.design.numRepetitions;
64+
numEventsPerBlock = cfg.design.nbEventsPerBlock;
6865
maxNumFixTargPerBlock = cfg.target.maxNbPerBlock;
6966

7067
if mod(numEventsPerBlock, length(motionDirections)) ~= 0
@@ -97,7 +94,6 @@
9794

9895
cfg.designBlockNames = cell(nrBlocks, 1);
9996
cfg.designDirections = zeros(nrBlocks, numEventsPerBlock);
100-
cfg.designSpeeds = ones(nrBlocks, numEventsPerBlock) * speedEvent;
10197
cfg.designFixationTargets = zeros(nrBlocks, numEventsPerBlock);
10298

10399
for iMotionBlock = 1:numRepetitions

0 commit comments

Comments
 (0)