prepare for radial motion

Author: Remi-Gau

initEnv.m

@@ -88,6 +88,7 @@ function addDependencies()
     pth = fileparts(mfilename('fullpath'));
     addpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src'));
     addpath(fullfile(pth, 'lib', 'CPP_PTB'));
+    addpath(genpath(fullfile(pth, 'lib', 'CPP_PTB', 'src')));
     addpath(fullfile(pth, 'subfun'));
 
 end

lib/CPP_BIDS

@@ -34,22 +34,25 @@
 
     %% Experiment Design
 
+%     cfg.design.motionType = 'translation'; 
+%     cfg.design.motionType = 'radial';
+    cfg.design.motionType = 'translation';
     cfg.design.names = {'static'; 'motion'};
     cfg.design.nbRepetitions = 4;
     cfg.design.nbEventsPerBlock = 12; % DO NOT CHANGE
 
     %% Timing
 
     % Time between blocs in secs
-    cfg.IBI = .5; % 8;
+    cfg.IBI = .1; % 8;
     % Time between events in secs
-    cfg.ISI = 0.5;
+    cfg.ISI = 0.1;
     % Number of seconds before the motion stimuli are presented
     cfg.onsetDelay = .1;
     % Number of seconds after the end all the stimuli before ending the run
     cfg.endDelay = .1;
 
-    cfg.eventDuration = 1; % second
+    cfg.eventDuration = 3; % second
 
     %% Visual Stimulation
 
@@ -68,7 +71,7 @@
     cfg.dot.color = cfg.color.white;
 
     % Diameter/length of side of aperture in Visual angles
-    cfg.aperture.type = 'circle';
+    cfg.aperture.type = 'none';
     cfg.aperture.width = []; % if left empty it will take the screen height
     cfg.aperture.xPos = 0;
 

lib/CPP_PTB

@@ -4,6 +4,8 @@
     % The conditions are consecutive static and motion blocks
     % (Gives better results than randomised).
     %
+    % Style guide: constants are in SNAKE_UPPER_CASE
+    %
     % EVENTS
     % The numEventsPerBlock should be a multiple of the number of "base"
     % listed in the MOTION_DIRECTIONS and STATIC_DIRECTIONS (4 at the moment).
@@ -55,6 +57,8 @@
 
     % Set variables here for a dummy test of this function
     if nargin < 1 || isempty(cfg)
+%         cfg.design.motionType = 'translation';
+        cfg.design.motionType = 'radial';
         cfg.design.names = {'static'; 'motion'};
         cfg.design.nbRepetitions = 4;
         cfg.design.nbEventsPerBlock = 12;
@@ -64,7 +68,7 @@
     end
 
     [NB_BLOCKS, NB_REPETITIONS, NB_EVENTS_PER_BLOCK, MAX_TARGET_PER_BLOCK] = getInput(cfg);
-    [~, STATIC_INDEX, motionIndex] = assignConditions(cfg);
+    [~, STATIC_INDEX, MOTION_INDEX] = assignConditions(cfg);
 
     RANGE_TARGETS = [1 MAX_TARGET_PER_BLOCK];
     targetPerCondition = repmat(RANGE_TARGETS, 1, NB_REPETITIONS / 2);
@@ -137,10 +141,7 @@
 
 function cfg = setDirections(cfg)
 
-    % CONSTANTS
-    % Set directions for static and motion condition
-    MOTION_DIRECTIONS = [0 90 180 270];
-    STATIC_DIRECTIONS = [-1 -1 -1 -1];
+    [MOTION_DIRECTIONS, STATIC_DIRECTIONS] = getDirectionBaseVectors(cfg);
 
     [NB_BLOCKS, NB_REPETITIONS, NB_EVENTS_PER_BLOCK] = getInput(cfg);
 
@@ -182,6 +183,23 @@
 
 end
 
+function [MOTION_DIRECTIONS, STATIC_DIRECTIONS] = getDirectionBaseVectors(cfg)
+    
+    % CONSTANTS
+    % Set directions for static and motion condition
+    
+    STATIC_DIRECTIONS = [-1 -1 -1 -1];
+    
+    switch cfg.design.motionType
+        case 'translation'
+            MOTION_DIRECTIONS = [0 90 180 270];
+        case 'radial'
+            STATIC_DIRECTIONS = [666 -666 666 -666];
+            MOTION_DIRECTIONS = [666 -666 666 -666];
+    end    
+    
+end
+
 function [nbBlocks, nbRepet, nbEventsBlock, maxTargBlock] = getInput(cfg)
     nbRepet = cfg.design.nbRepetitions;
     nbEventsBlock = cfg.design.nbEventsPerBlock;
@@ -253,18 +271,19 @@ function diplayDesign(cfg, displayFigs)
         title('Fixation Targets position distribution');
 
         figure(2);
+        
+        [motionDirections] = getDirectionBaseVectors(cfg);
+        motionDirections = unique(motionDirections);
 
-        MOTION_DIRECTIONS = [0 90 180 270];
-
-        for iMotion = 1:length(MOTION_DIRECTIONS)
+        for iMotion = 1:length(motionDirections)
 
-            [~, position] = find(directions == MOTION_DIRECTIONS(iMotion));
+            [~, position] = find(directions == motionDirections(iMotion));
 
             subplot(2, 2, iMotion);
             hist(position);
             scaleAxes();
             labelAxesFreq();
-            title(num2str(MOTION_DIRECTIONS(iMotion)));
+            title(num2str(motionDirections(iMotion)));
 
         end