mh autofix

Author: Remi-Gau

getExperimentStart.m

@@ -2,9 +2,9 @@
     % cfg = getExperimentStart(cfg)
     %
     % Stores the onset time in cfg.experimentStart
-    
+
     drawFixation(cfg);
     vbl = Screen('Flip', cfg.screen.win);
     cfg.experimentStart = vbl;
-    
+
 end

src/aperture/apertureTexture.m

@@ -4,66 +4,66 @@
     %
 
     switch action
-        
+
         case 'init'
-            
+
             cfg = apertureInit(cfg);
-            
+
             cfg.aperture.texture = Screen('MakeTexture', cfg.screen.win, ...
                 cfg.color.background(1) * ones(cfg.screen.winRect([4 3])));
-            
+
         case 'make'
-            
+
             transparent = [0, 0, 0, 0];
-            
+
             xCenter = cfg.screen.center(1);
             yCenter = cfg.screen.center(2);
-            
+
             switch cfg.aperture.type
-                
+
                 case 'none'
-                    
+
                     Screen('Fillrect', cfg.aperture.texture, transparent);
-                    
+
                 case 'circle'
-                    
+
                     diameter = cfg.aperture.widthPix;
-                    
+
                     if isfield(cfg.aperture, 'xPosPix')
                         xCenter = cfg.screen.center(1) + cfg.aperture.xPosPix;
                     end
                     if isfield(cfg.aperture, 'yPosPix')
                         yCenter = cfg.screen.center(2) + cfg.aperture.yPosPix;
                     end
-                    
+
                     Screen('FillOval', cfg.aperture.texture, transparent, ...
                         CenterRectOnPoint([0, 0, repmat(diameter, 1, 2)], ...
                         xCenter, yCenter));
-                    
+
                 case 'ring'
-                    
+
                     % expansion speed is log over eccentricity
                     [cfg] = eccenLogSpeed(cfg, thisEvent.time);
-                    
+
                     Screen('Fillrect', cfg.aperture.texture, cfg.color.background);
-                    
+
                     Screen('FillOval', cfg.aperture.texture, transparent, ...
                         CenterRectOnPoint( ...
                         [0, 0, repmat(cfg.ring.outerRimPix, 1, 2)], ...
                         xCenter, yCenter));
-                    
+
                     Screen('FillOval', cfg.aperture.texture, [cfg.color.background 255], ...
                         CenterRectOnPoint( ...
                         [0, 0, repmat(cfg.ring.innerRimPix, 1, 2)], ...
                         xCenter, yCenter));
-                    
+
                 case 'wedge'
-                    
+
                     cycleDuration = cfg.mri.repetitionTime * cfg.volsPerCycle;
-                    
+
                     % Update angle for rotation of background and for apperture for wedge
                     switch cfg.direction
-                        
+
                         case '+'
                             thisEvent.angle = 90 - ...
                                 cfg.aperture.width / 2 + ...
@@ -72,83 +72,79 @@
                             thisEvent.angle = 90 - ...
                                 cfg.aperture.width / 2 - ...
                                 (thisEvent.time / cycleDuration) * 360;
-                            
+
                     end
-                    
+
                     Screen('Fillrect', cfg.aperture.texture, cfg.color.background);
-                    
+
                     Screen('FillArc', cfg.aperture.texture, transparent, ...
                         CenterRect( ...
                         [0, 0, repmat(cfg.stimRect(4), 1, 2)], ...
                         cfg.screen.winRect), ...
                         thisEvent.angle, ... % start angle
                         cfg.aperture.width); % arc angle
-                    
+
                 case 'bar'
-                    
+
                     % aperture is the color of the background
                     Screen('FillRect', cfg.aperture.texture, cfg.color.background);
-                    
+
                     % We let the stimulus through
                     Screen('FillOval', cfg.aperture.texture, transparent, ...
                         CenterRect([0, 0, repmat(cfg.stimRect(3), 1, 2)], cfg.screen.winRect));
-                    
+
                     % Then we add the position of the bar aperture
                     Screen('FillRect', cfg.aperture.texture, cfg.color.background, ...
                         [0, ...
                         0, ...
                         thisEvent.barPosPix - cfg.aperture.barWidthPix / 2, ...
                         cfg.screen.winRect(4)]);
-                    
+
                     Screen('FillRect', cfg.aperture.texture, cfg.color.background, ...
                         [thisEvent.barPosPix + cfg.aperture.barWidthPix / 2, ...
                         0, ...
                         cfg.screen.winRect(3), ...
                         cfg.screen.winRect(4)]);
 
                 otherwise
-                    
+
                     error('unknown aperture type: %s.', cfg.aperture.type);
-                    
+
             end
-            
+
         case 'draw'
-            
+
             if strcmp(cfg.aperture.type, 'bar')
-                
+
                 % Draw aperture and we rotate to match the required condition
                 Screen('DrawTexture', cfg.screen.win, cfg.aperture.texture, ...
                     cfg.screen.winRect, ...
                     cfg.screen.winRect, ...
                     thisEvent.condition - 90);
             else
-                
+
                 Screen('DrawTexture', cfg.screen.win, cfg.aperture.texture);
-                
-            end
 
-            
+            end
 
-            
     end
-    
-end
 
+end
 
 function cfg = apertureInit(cfg)
-    
+
     switch cfg.aperture.type
-        
+
         case 'circle'
             % we take the screen height as maximum aperture width if not
             % specified.
             if ~isfield(cfg.aperture, 'width') || isempty(cfg.aperture.width)
                 cfg.aperture.width = cfg.screen.winRect(4) / cfg.screen.ppd;
             end
             cfg.aperture = degToPix('width', cfg.aperture, cfg);
-            
+
         case 'ring'
-            
+
             % Set parameters for rings
             if strcmp(cfg.aperture.type, 'ring')
                 % scale of outer ring (exceeding screen until
@@ -165,22 +161,22 @@
                     log(cfg.ring.maxEcc + exp(1)) - ...
                     (cfg.ring.maxEcc + exp(1))) ;
             end
-            
+
         case 'bar'
-            
+
             % Set parameters drifting bars
             cfg.aperture.barWidthPix = cfg.stimRect(3) / cfg.volsPerCycle;
             cfg.aperture.barPosPix = ...
-                [ 0:cfg.aperture.barWidthPix:cfg.stimRect(3) - cfg.aperture.barWidthPix ] + ...
+                [0:cfg.aperture.barWidthPix:cfg.stimRect(3) - cfg.aperture.barWidthPix] + ...
                 (cfg.screen.winRect(3) / 2 - cfg.stimRect(3) / 2) + ...
                 cfg.aperture.barWidthPix / 2; %#ok<NBRAK>
-            
+
             % Width of bar in degrees of VA (needed for saving)
             cfg.aperture.width = cfg.aperture.barWidthPix / cfg.screen.ppd;
             cfg.aperture.barPos = ...
                 (cfg.aperture.barPosPix - cfg.screen.center(1)) / ...
                 cfg.screen.ppd;
-            
+
     end
-    
-end
+
+end

tests/test_reseedDots.m

@@ -9,16 +9,16 @@
 function test_reseedDotsBasic()
 
     cfg.screen.winWidth = 2000;
-    
+
     cfg.design.motionType = 'radial';
-    
+
     cfg.dot.matrixWidth = 50; % in pixels
     cfg.dot.number = 5;
     cfg.dot.sizePix = 20;
     cfg.dot.proportionKilledPerFrame = 0;
 
     cfg.fixation.widthPix = 20;
-    
+
     dots.lifeTime = 100;
     dots.speedPixPerFrame = 3;
     dots.direction = 90;