refactor preTrialSetup

Author: Remi-Gau

subfun/doDotMo.m

@@ -1,4 +1,4 @@
-function [onset, duration] = doDotMo(cfg, thisEvent)
+function [onset, duration] = doDotMo(cfg, thisEvent, thisFixation)
     % Draws the stimulation of static/moving in 4 directions dots or static
     %
     % DIRECTIONS
@@ -46,9 +46,6 @@
 
         apertureTexture('draw', cfg, thisEvent);
 
-        % If this frame shows a target we change the color of the cross
-        thisFixation.fixation = cfg.fixation;
-        thisFixation.screen = cfg.screen;
         if thisEvent.target(1) && GetSecs < (onset + cfg.target.duration)
             thisFixation.fixation.color = cfg.fixation.colorTarget;
         end

subfun/preTrialSetup.m

@@ -0,0 +1,21 @@
+function varargout = preTrialSetup(varargin)
+    % varargout = postInitializatinSetup(varargin)
+
+    % generic function to finalize some set up after psychtoolbox has been
+    % initialized
+
+    [cfg, iBlock, iEvent] = deal(varargin{:});
+
+    % set direction, speed of that event and if it is a target
+    thisEvent.trial_type = cfg.design.blockNames{iBlock};
+    thisEvent.direction = cfg.design.directions(iBlock, iEvent);
+    thisEvent.speed = cfg.design.speeds(iBlock, iEvent);
+    thisEvent.target = cfg.design.fixationTargets(iBlock, iEvent);
+    
+    % If this frame shows a target we change the color of the cross
+    thisFixation.fixation = cfg.fixation;
+    thisFixation.screen = cfg.screen;
+
+    varargout = {thisEvent, thisFixation};
+
+end

visualLocTranslational.m

@@ -79,11 +79,7 @@
             % Check for experiment abortion from operator
             checkAbort(cfg, cfg.keyboard.keyboard);
 
-            % set direction, speed of that event and if it is a target
-            thisEvent.trial_type = cfg.design.blockNames{iBlock};
-            thisEvent.direction = cfg.design.directions(iBlock, iEvent);
-            thisEvent.speed = cfg.design.speeds(iBlock, iEvent);
-            thisEvent.target = cfg.design.fixationTargets(iBlock, iEvent);
+            [thisEvent, thisFixation] = preTrialSetup(cfg, iBlock, iEvent);
 
             % we wait for a trigger every 2 events
             if cfg.pacedByTriggers.do && mod(iEvent, 2) == 1
@@ -95,7 +91,7 @@
             end
 
             % play the dots and collect onset and duraton of the event
-            [onset, duration] = doDotMo(cfg, thisEvent);
+            [onset, duration] = doDotMo(cfg, thisEvent, thisFixation);
 
             thisEvent.event = iEvent;
             thisEvent.block = iBlock;