Merge pull request #79 from Remi-Gau/dev

simplify code for static dot position repeats

Author: Remi-Gau

lib/CPP_PTB

@@ -63,7 +63,7 @@
     %% Timing
 
     % FOR 7T: if you want to create localizers on the fly, the following must be
-    % multiples of the scanneryour sequence TR
+    % multiples of the scanner sequence TR
     %
     % IBI
     % block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock
@@ -130,7 +130,6 @@
 
     % Fixation cross (in pixels)
     cfg.fixation.type = 'cross';
-    cfg.fixation.colorTarget = cfg.color.red;
     cfg.fixation.color = cfg.color.white;
     cfg.fixation.width = .25;
     cfg.fixation.lineWidthPix = 3;
@@ -142,7 +141,12 @@
     cfg.target.duration = 0.1; % In secs
     cfg.target.type = 'fixation_cross';
     % 'fixation_cross' : the fixation cross changes color
-    % 'static_repeat' : dots are in the same position
+    % 'static_repeat' : static dots are in the same position as previous trials
+
+    cfg.fixation.colorTarget = cfg.fixation.color;
+    if strcmp(cfg.target.type, 'fixation_cross')
+        cfg.fixation.colorTarget = cfg.color.red;
+    end
 
     cfg.extraColumns = { ...
                         'direction', ...

setParameters.m

@@ -18,8 +18,7 @@
     % We then draw an aperture on top to hide the certain dots.
 
     %% Get parameters
-    if ~(strcmp(thisEvent.trial_type, 'static') && thisEvent.target == 1) ||  ...
-        isempty(dots)
+    if isempty(dots)
         dots = initDots(cfg, thisEvent);
     end
 

subfun/doDotMo.m

@@ -77,8 +77,10 @@
         fprintf('\n - Running Block %.0f \n', iBlock);
 
         eyeTracker('Message', cfg, ['start_block-', num2str(iBlock)]);
+
         dots = [];
         previousEvent.target = 0;
+
         % For each event in the block
         for iEvent = 1:cfg.design.nbEventsPerBlock
 
@@ -99,10 +101,15 @@
             eyeTracker('Message', cfg, ...
                        ['start_trial-', num2str(iEvent), '_', thisEvent.trial_type]);
 
-            % we want to initialize the dots position when targets type is fixation cross
-            % or if this the first event of a target pair
+            % we only reuse the dots position for targets that consists of
+            % presenting static dots with the same position as those of the
+            % previous trial
+            %
+            % TODO does not take into account what to do if 3 or more targets in a row
             if strcmp(cfg.target.type, 'static_repeat') && ...
-                    thisEvent.target == previousEvent.target
+               strcmp(thisEvent.trial_type, 'static') && ...
+               thisEvent.target == 1 && ...
+               thisEvent.target == previousEvent.target
             else
                 dots = [];
             end