mh fix

Author: Remi-Gau

lib/CPP_PTB

@@ -71,19 +71,19 @@
     cfg.timing.onsetDelay = 0;
     % Number of seconds after the end all the stimuli before ending the run
     cfg.timing.endDelay = 3.6;
-    
+
     if isfield(cfg.design, 'localizer') && strcmpi(cfg.design.localizer, 'MT_MST')
         cfg.timing.IBI = 3.6;
     end
-    
+
     % reexpress those in terms of repetition time
     if cfg.pacedByTriggers.do
-        
+
         cfg.pacedByTriggers.quietMode = true;
         cfg.pacedByTriggers.nbTriggers = 1;
-        
+
         cfg.timing.eventDuration = cfg.mri.repetitionTime / 2 - 0.04; % second
-        
+
         % Time between blocs in secs
         cfg.timing.IBI = 0;
         % Time between events in secs
@@ -92,15 +92,15 @@
         cfg.timing.onsetDelay = 0;
         % Number of seconds after the end all the stimuli before ending the run
         cfg.timing.endDelay = 2;
-        
+
         if isfield(cfg.design, 'localizer') && strcmpi(cfg.design.localizer, 'MT_MST')
             cfg.timing.IBI = 2;
         end
-        
+
     end
-    
+
     %% Visual Stimulation
-    
+
     % Speed in visual angles / second
     cfg.dot.speed = 15;
     % Coherence Level (0-1)
@@ -112,14 +112,14 @@
     % proportion of dots killed per frame
     cfg.dot.proportionKilledPerFrame = 0;
     % Dot Size (dot width) in visual angles.
-    cfg.dot.size = .1;
+    cfg.dot.size = .2;
     cfg.dot.color = cfg.color.white;
 
     % Diameter/length of side of aperture in Visual angles
     cfg.aperture.type = 'none';
     cfg.aperture.width = []; % if left empty it will take the screen height
     cfg.aperture.xPos = 0;
-    
+
     if isfield(cfg.design, 'localizer') && strcmpi(cfg.design.localizer, 'MT_MST')
         cfg.aperture.type = 'circle';
         cfg.aperture.width = 7; % if left empty it will take the screen height

setParameters.m

@@ -30,14 +30,14 @@
         [dots] = updateDots(dots, cfg);
 
         %% Center the dots
-        
+
         % We assumed that zero is at the top left, but we want it to be
         %  in the center, so shift the dots up and left, which just means
-        %  adding half of the screen width in pixel to both the x and y direction.       
+        %  adding half of the screen width in pixel to both the x and y direction.
         thisEvent.dot.positions = (dots.positions - cfg.dot.matrixWidth / 2)';
 
         %% make textures
-        
+
         dotTexture('make', cfg, thisEvent);
 
         apertureTexture('make', cfg, thisEvent);

subfun/doDotMo.m

@@ -169,7 +169,6 @@
 
 end
 
-
 function [conditionNamesVector, STATIC_INDEX, MOTION_INDEX] = assignConditions(cfg)
 
     [~, nbRepet] = getDesignInput(cfg);

subfun/expDesign.m

@@ -169,4 +169,4 @@
     FIX_RIGHT_INDEX = find(strcmp(conditionNamesVector, 'fixation_right'));
     FIX_LEFT_INDEX = find(strcmp(conditionNamesVector, 'fixation_left'));
 
-end
+end

subfun/expDesignMtMst.m

@@ -3,4 +3,4 @@
     nbEventsBlock = cfg.design.nbEventsPerBlock;
     maxTargBlock = cfg.target.maxNbPerBlock;
     nbBlocks = length(cfg.design.names) * nbRepet;
-end
+end

subfun/getDesignInput.m

@@ -1,28 +1,28 @@
 function varargout = preSaveSetup(varargin)
     % varargout = postInitializatinSetup(varargin)
-    
+
     % generic function to prepare structures before saving
-    
+
     [thisEvent, iBlock, iEvent, duration, onset, cfg, logFile] = deal(varargin{:});
-    
+
     thisEvent.event = iEvent;
     thisEvent.block = iBlock;
     thisEvent.keyName = 'n/a';
     thisEvent.duration = duration;
     thisEvent.onset = onset - cfg.experimentStart;
-    
+
     % % this value should be in degrees / second in the log file
     % % highlights that the way speed is passed around could be
     % % simplified.
     % %
     % thisEvent.speed
     % %
-    
+
     % Save the events txt logfile
     % we save event by event so we clear this variable every loop
     thisEvent.fileID = logFile.fileID;
     thisEvent.extraColumns = logFile.extraColumns;
-    
+
     varargout = {thisEvent};
-    
-end
+
+end

subfun/preSaveSetup.m

@@ -9,29 +9,27 @@
     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.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;
-    
+
     switch thisEvent.trial_type
         case 'fixation_right'
             cfg.aperture.xPosPix = -abs(cfg.aperture.xPosPix);
-            
+
             thisFixation.fixation.xDisplacement = cfg.aperture.xPos;
             thisFixation = initFixation(thisFixation);
-    
+
         case 'fixation_left'
             cfg.aperture.xPosPix = +abs(cfg.aperture.xPosPix);
-            
+
             thisFixation.fixation.xDisplacement = -cfg.aperture.xPos;
             thisFixation = initFixation(thisFixation);
-            
+
     end
 
     varargout = {thisEvent, thisFixation, cfg};
-    
-
 
-end
+end

subfun/preTrialSetup.m

@@ -113,11 +113,11 @@
         end
 
         eyeTracker('StopRecordings', cfg);
-        
+
         % "prepare" cross for the baseline block
         % if MT / MST this allows us to set the cross at the position of the next block
         if iBlock < cfg.design.nbBlocks
-            nextBlock = iBlock+1;
+            nextBlock = iBlock + 1;
         else
             nextBlock = cfg.design.nbBlocks;
         end