mh autofix

Author: Remi-Gau

apertureTexture.m

@@ -27,7 +27,7 @@
                 case 'circle'
 
                     diameter = cfg.aperture.widthPix;
-                    
+
                     xPos = cfg.screen.center(1);
                     yPos = cfg.screen.center(2);
                     if isfield(cfg.aperture, 'xPosPix')
@@ -40,7 +40,7 @@
                     Screen('FillOval', cfg.aperture.texture, transparent, ...
                         CenterRectOnPoint([0 0 repmat(diameter, 1, 2)], ...
                         xPos, yPos));
-                        
+
             end
 
         case 'draw'

computeFOV.m

@@ -5,13 +5,13 @@
     %
     % δ = 2 arctan ( d / 2D )
     %
-    %  δ is the angular diameter, and d is the actual diameter of the object, 
-    %  and D is the distance to the object. 
-    %  The result obtained is in radians. 
+    %  δ is the angular diameter, and d is the actual diameter of the object,
+    %  and D is the distance to the object.
+    %  The result obtained is in radians.
     %
 
     FOV =  ...
         180 / pi * ...
-        2 * atan( cfg.screen.monitorWidth / (2 * cfg.screen.monitorDistance) );
+        2 * atan(cfg.screen.monitorWidth / (2 * cfg.screen.monitorDistance));
 
 end

dotTexture.m

@@ -7,7 +7,7 @@
                 cfg.color.background(1) * ones(cfg.screen.winRect([4 3])));
 
         case 'make'
-            
+
             dotType = 2;
 
             Screen('FillRect', cfg.dot.texture, cfg.color.background);

drawFixation.m

@@ -2,9 +2,9 @@ function drawFixation(cfg)
     % Define the parameters of the fixation cross in `cfg` and `expParameters`
 
     if strcmp(cfg.fixation.type, 'cross')
-        
+
         smooth = 1;
-        
+
         Screen('DrawLines', ...
             cfg.screen.win, ...
             cfg.fixation.allCoords, ...

initFixation.m

@@ -8,12 +8,12 @@
         cfg.fixation = degToPix('yDisplacement', cfg.fixation, cfg);
 
         % Prepare fixation cross
-        cfg.fixation.xCoords = [-cfg.fixation.widthPix cfg.fixation.widthPix 0 0]/2 + ...
+        cfg.fixation.xCoords = [-cfg.fixation.widthPix cfg.fixation.widthPix 0 0] / 2 + ...
             cfg.fixation.xDisplacementPix;
-        cfg.fixation.yCoords = [0 0 -cfg.fixation.widthPix cfg.fixation.widthPix]/2 + ...
+        cfg.fixation.yCoords = [0 0 -cfg.fixation.widthPix cfg.fixation.widthPix] / 2 + ...
             cfg.fixation.yDisplacementPix;
         cfg.fixation.allCoords = [cfg.fixation.xCoords; cfg.fixation.yCoords];
 
     end
 
-end
+end

initializeDots.m

@@ -1,21 +1,21 @@
 function [dots] = initializeDots(cfg, thisEvent)
-    
+
     direction = thisEvent.direction(1);
-    
+
     dots.lifeTime = cfg.dot.lifeTime;
-    
-    speedPixPerFrame = thisEvent.speed(1); 
-    
+
+    speedPixPerFrame = thisEvent.speed(1);
+
     % decide which dots are signal dots (1) and those are noise dots (0)
     dots.isSignal = rand(cfg.dot.number, 1) < cfg.dot.coherence;
-    
+
     % for static dots
     if direction == -1
         speedPixPerFrame = 0;
         dots.lifeTime = cfg.eventDuration;
         dots.isSignal = ones(cfg.dot.number, 1);
     end
-    
+
     % Convert from seconds to frames
     dots.lifeTime = ceil(dots.lifeTime / cfg.screen.ifi);
 
@@ -24,27 +24,26 @@
     % [0,0] is the top / left of the square
     % [1,1] is the bottom / right of the square
     dots.positions = rand(cfg.dot.number, 2) * cfg.screen.winWidth;
-    
-    % Set a N x 2 matrix that speed in X and Y 
+
+    % Set a N x 2 matrix that speed in X and Y
     dots.speeds = nan(cfg.dot.number, 2);
-    
+
     % Coherent dots
     [horVector, vertVector] = decompMotion(direction);
-    dots.speeds(dots.isSignal,:) = ...
+    dots.speeds(dots.isSignal, :) = ...
         repmat([horVector, vertVector], sum(dots.isSignal), 1);
-    
+
     % If not 100% coherence, we get new random direction for the other dots
     direction = rand(sum(~dots.isSignal), 1) * 360;
     [horVector, vertVector] = decompMotion(direction);
     dots.speeds(~dots.isSignal, :) = [horVector, vertVector];
-    
+
     % So far we were working wiht unit vectors convert that speed in pixels per
     % frame
     dots.speeds = dots.speeds * speedPixPerFrame;
-    
+
     % Create a vector to update to dotlife time of each dot
     % Not all set to one so the dots will die at different times
     dots.time = floor(rand(cfg.dot.number, 1) * cfg.eventDuration / cfg.screen.ifi);
-    
-end
 
+end

tests/test_setDefaultsPTB.m

@@ -61,7 +61,6 @@ function test_setDefaultsPTB()
         'monitorWidth', 42, ...
         'monitorDistance', 134));
 
-
     % fixation cross or dot
     expectedCFG.fixation.type = 'cross';
     expectedCFG.fixation.xDisplacement = 0;

updateDots.m

@@ -1,5 +1,5 @@
 function [dots] = updateDots(dots, cfg)
-    
+
     % Move the selected dots
     dots.positions = dots.positions + dots.speeds;
 
@@ -8,19 +8,19 @@
     % - an x position superior to winWidth
     % - an x position superior to winHeight
     % - has exceeded its liftime
-    N = any([...
+    N = any([ ...
         dots.positions > cfg.screen.winWidth, ...
         dots.positions < 0, ...
         dots.time > dots.lifeTime, ...
-        rand(cfg.dot.number,1) < cfg.dot.proportionKilledPerFrame ], 2) ;
-    
+        rand(cfg.dot.number, 1) < cfg.dot.proportionKilledPerFrame], 2) ;
+
     % If there is any such dot we relocate it to a new random position
     % and change its lifetime to 1
     if any(N)
         dots.positions(N, :) = rand(sum(N), 2) * cfg.screen.winWidth;
         dots.time(N, 1) = 1;
     end
-    
+
     % Add one frame to the dot lifetime to each dot
     dots.time = dots.time + 1;
 end