small fixes

Author: Remi-Gau

.gitattributes

@@ -0,0 +1,2 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto

initEnv.m

@@ -24,7 +24,7 @@
             error('Minimum required Octave version: %s', octaveVersion);
         end
 
-        installlist = {'statistics'};
+        installlist = {'statistics', 'image'};
         for ii = 1:length(installlist)
             try
                 % Try loading Octave packages

setParameters.m

@@ -1,10 +1,10 @@
-function [cfg, expParameters] = setParameters
+function [cfg, expParameters] = setParameters();
 
     % Initialize the parameters and general configuration variables
     expParameters = struct();
     cfg = struct();
 
-    expParameters.task = 'visualLocalizer';
+    
 
     % by default the data will be stored in an output folder created where the
     % setParamters.m file is
@@ -67,6 +67,8 @@
     cfg.diameterAperture = 8;
 
     %% Task(s)
+    
+    expParameters.task = 'visualLocalizer';
 
     % Instruction
     expParameters.taskInstruction = '1-Detect the RED fixation cross\n \n\n';
@@ -83,6 +85,8 @@
     expParameters.yDisplacementFixCross = 0; % Manual displacement of the fixation cross
     expParameters.fixationCrossColor = cfg.white;
     expParameters.fixationCrossColorTarget = cfg.red;
+    
+    expParameters.extraColumns = {'direction', 'speed', 'target', 'event', 'block'};
 end
 
 function [cfg, expParameters] = setKeyboards(cfg, expParameters)

visualLocTanslational.m

@@ -30,10 +30,8 @@
 % Prepare for fixation Cross
 cfg.xCoords = [-expParameters.fixCrossDimPix expParameters.fixCrossDimPix 0 0] + ...
     expParameters.xDisplacementFixCross;
-
 cfg.yCoords = [0 0 -expParameters.fixCrossDimPix expParameters.fixCrossDimPix] + ...
     expParameters.yDisplacementFixCross;
-
 cfg.allCoords = [cfg.xCoords; cfg.yCoords];
 
 %%  Experiment
@@ -55,7 +53,7 @@
     % % %
 
     % Prepare for the output logfiles with all
-    logFile.extraColumns = {'direction', 'speed', 'target', 'event', 'block'};
+    logFile.extraColumns = expParameters.extraColumns;
     logFile = saveEventsFile('open', expParameters, logFile);
 
     % Wait for space key to be pressed
@@ -66,7 +64,6 @@
     getResponse('start', cfg.keyboard.responseBox);
 
     % Show instructions
-
     DrawFormattedText(cfg.win, expParameters.taskInstruction, ...
         'center', 'center', cfg.textColor);
     Screen('Flip', cfg.win);
@@ -116,9 +113,7 @@
             thisEvent.fileID = logFile.fileID;
             thisEvent.extraColumns = logFile.extraColumns;
 
-            disp(1)
             saveEventsFile('save', expParameters, thisEvent);
-            disp(2)
 
             clear thisEvent;
 
@@ -128,8 +123,6 @@
 
             if isfield(responseEvents(1), 'onset') && ~isempty(responseEvents(1).onset)
 
-                responseEvents.fileID = logFile.fileID;
-
                 for iResp = 1:size(responseEvents, 1)
                     responseEvents(iResp).onset = ...
                         responseEvents(iResp).onset - cfg.experimentStart;
@@ -139,7 +132,10 @@
                     responseEvents(iResp).block = iBlock;
                 end
 
-                saveEventsFile('save', expParameters, thisEvent);
+                responseEvents.fileID = logFile.fileID;
+                responseEvents.extraColumns = logFile.extraColumns;
+                saveEventsFile('save', expParameters, responseEvents);
+
             end
 
             % wait for the inter-stimulus interval