mh fix

Author: Remi-Gau

src/dot/decomposeMotion.m

@@ -6,7 +6,7 @@
     % - angleMotion: in degrees
     % - horVector: horizontal component of motion
     % - vertVector: vertical component of motion
-    
+
     horVector = cos(pi * angleMotion / 180);
     vertVector = -sin(pi * angleMotion / 180);
 end

src/dot/setDotDirection.m

@@ -13,14 +13,14 @@
     directionAllDots = nan(cfg.dot.number, 1);
 
     % Coherent dots
-    
+
     if numel(dots.direction) == 1
         dots.direction = ones(sum(dots.isSignal), 1) * dots.direction;
     elseif numel(dots.direction) ~= sum(dots.isSignal)
         error(['dots.direction must have one element' ...
-               'or as many element as there are coherent dots'])
+               'or as many element as there are coherent dots']);
     end
-    
+
     directionAllDots(dots.isSignal) = dots.direction;
 
     if strcmp(cfg.design.motionType, 'radial')
@@ -29,7 +29,7 @@
     end
 
     % Random direction for the non coherent dots
-    
+
     directionAllDots(~dots.isSignal) = rand(sum(~dots.isSignal), 1) * 360;
     directionAllDots = rem(directionAllDots, 360);
 

src/errors/errorDistanceToScreen.m

@@ -1,12 +1,11 @@
 function errorDistanceToScreen(cfg)
-    
+
     errorStruct.message = sprintf([
         'Distance to monitor seems too small.\n' ...
         'It should be in centimeters.\n' ...
         'cfg.screen.monitorDistance = %f'], cfg.screen.monitorDistance);
-    
+
     errorStruct.identifier = 'computeFOV:wrongDistanceToScreen';
 
     error(errorStruct);
 end
-

src/fixation/initFixation.m

@@ -11,50 +11,48 @@
     % cfg.fixation.xDisplacement
     % cfg.fixation.yDisplacement
     %
-    % for cfg.fixation.type == 'bestFixation'            
+    % for cfg.fixation.type == 'bestFixation'
     % Code adapted from:
     % "What is the best fixation target?"
     % DOI 10.1016/j.visres.2012.10.012
     %
     % Contains a fixation cross and a dot
     %
-    
-    
+
     % Convert some values from degrees to pixels
     cfg.fixation = degToPix('width', cfg.fixation, cfg);
     cfg.fixation = degToPix('xDisplacement', cfg.fixation, cfg);
     cfg.fixation = degToPix('yDisplacement', cfg.fixation, cfg);
-    
+
     % Prepare fixation cross
     xLine = [-cfg.fixation.widthPix cfg.fixation.widthPix 0 0] / 2;
     yLine = [0 0 -cfg.fixation.widthPix cfg.fixation.widthPix] / 2;
-    
+
     cfg.fixation.xCoords =  xLine + cfg.fixation.xDisplacementPix;
     cfg.fixation.yCoords =  yLine + cfg.fixation.yDisplacementPix;
-    
+
     cfg.fixation.allCoords = [cfg.fixation.xCoords; cfg.fixation.yCoords];
-    
-    
+
     switch cfg.fixation.type
-        
+
         case 'bestFixation'
-            
+
             % Code adapted from:
             % What is the best fixation target?
             % DOI 10.1016/j.visres.2012.10.012
-            
+
             cfg.fixation.outerOval = [ ...
                 cfg.screen.center(1) - cfg.fixation.widthPix / 2, ...
                 cfg.screen.center(2) - cfg.fixation.widthPix / 2, ...
                 cfg.screen.center(1) + cfg.fixation.widthPix / 2, ...
                 cfg.screen.center(2) + cfg.fixation.widthPix / 2];
-            
+
             cfg.fixation.innerOval = [ ...
                 cfg.screen.center(1) - cfg.fixation.widthPix / 6, ...
                 cfg.screen.center(2) - cfg.fixation.widthPix / 6, ...
                 cfg.screen.center(1) + cfg.fixation.widthPix / 6, ...
                 cfg.screen.center(2) + cfg.fixation.widthPix / 6];
-            
+
     end
-    
+
 end

src/keyboard/checkAbortGetResponse.m

@@ -6,4 +6,4 @@ function checkAbortGetResponse(responseEvents, cfg)
             )
         errorAbortGetReponse;
     end
-end
+end

src/utils/computeFOV.m

@@ -9,7 +9,7 @@
     %  and D is the distance to the object.
     %  The result obtained is in radians.
     %
-    
+
     if cfg.screen.monitorDistance < 2
         errorDistanceToScreen(cfg);
     end

src/waitForTrigger.m

@@ -3,9 +3,9 @@ function waitForTrigger(varargin)
     %
     % Counts a certain number of triggers coming from the scanner before returning.
     %
-    % If you are not using the quietMode, it flips and waits for half a TR before starting to 
-    % check for the next trigger (unless this was the last trigger to wait for and in 
-    % this case it returns immediately). 
+    % If you are not using the quietMode, it flips and waits for half a TR before starting to
+    % check for the next trigger (unless this was the last trigger to wait for and in
+    % this case it returns immediately).
     %
     % Will print the count down in the command line and on the PTB window if one is
     % opened.

tests/test_checkAbortGetResponse.m

@@ -7,14 +7,14 @@
 end
 
 function test_checkAbortGetResponseBasic()
-    
+
     responseEvents(1).keyName = 'a';
     responseEvents(2).keyName = '2';
     responseEvents(3).keyName = 'ESCAPE';
-    
+
     cfg.keyboard.escapeKey = 'ESCAPE';
-    
+
     assertExceptionThrown(@()checkAbortGetResponse(responseEvents, cfg), ...
         'getResponse:abortRequested');
-     
-end
+
+end

tests/test_computeFOV.m

@@ -7,24 +7,23 @@
 end
 
 function test_computeFOVBasic()
-    
+
     cfg.screen.monitorWidth = 25;
     cfg.screen.monitorDistance = 50;
-    
+
     FOV = computeFOV(cfg);
-    
+
     expectedFOV = 28.072;
-    
-    assertElementsAlmostEqual(expectedFOV, FOV, 'absolute', 1e-3)
-    
+
+    assertElementsAlmostEqual(expectedFOV, FOV, 'absolute', 1e-3);
+
 end
 
 function test_computeFOVError()
-    
+
     cfg.screen.monitorDistance = 1.2; % error as distance is most likely in meter
-    
+
     assertExceptionThrown(@()computeFOV(cfg), ...
         'computeFOV:wrongDistanceToScreen');
-    
-end
 
+end

tests/test_decomposeMotion.m

@@ -7,26 +7,25 @@
 end
 
 function test_decomposeMotionBasic()
-    
+
     [horVector, vertVector] = decomposeMotion(0);
     expectedOutput = [1, 0];
     assertEqual(expectedOutput, [horVector, vertVector]);
-    
+
     [horVector, vertVector] = decomposeMotion(90);
     expectedOutput = [0, -1];
     assertElementsAlmostEqual(expectedOutput, [horVector, vertVector]);
-    
+
     [horVector, vertVector] = decomposeMotion(180);
     expectedOutput = [-1, 0];
     assertElementsAlmostEqual(expectedOutput, [horVector, vertVector]);
-    
+
     [horVector, vertVector] = decomposeMotion(270);
     expectedOutput = [0, 1];
     assertElementsAlmostEqual(expectedOutput, [horVector, vertVector]);
-    
+
     [horVector, vertVector] = decomposeMotion(360);
     expectedOutput = [1, 0];
     assertElementsAlmostEqual(expectedOutput, [horVector, vertVector]);
-    
-     
-end
+
+end