refactor response and trigger collection

Author: Remi-Gau

subfun/doDotMo.m

@@ -46,7 +46,7 @@
 
         apertureTexture('draw', cfg, thisEvent);
 
-        % If this frame shows a target we change the color
+        % If this frame shows a target we change the color of the cross
         thisFixation.fixation = cfg.fixation;
         thisFixation.screen = cfg.screen;
         if thisEvent.target(1) && GetSecs < (onset + cfg.target.duration)

subfun/saveResponsesAndTriggers.m

@@ -0,0 +1,24 @@
+function saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString)
+
+    if isfield(responseEvents(1), 'onset') && ~isempty(responseEvents(1).onset)
+
+        for iResp = 1:size(responseEvents, 1)
+            responseEvents(iResp).onset = ...
+                responseEvents(iResp).onset - cfg.experimentStart;
+            responseEvents(iResp).event = 'n/a';
+            responseEvents(iResp).block = 'n/a';
+            responseEvents(iResp).direction = 'n/a';
+            responseEvents(iResp).speed = 'n/a';
+            responseEvents(iResp).target = 'n/a';
+            if strcmp(responseEvents(iResp).keyName, 't')
+                responseEvents(iResp).trial_type = triggerString;
+            end
+        end
+
+        responseEvents(1).fileID = logFile.fileID;
+        responseEvents(1).extraColumns = logFile.extraColumns;
+        saveEventsFile('save', cfg, responseEvents);
+
+    end
+
+end

visualLocTanslational.m

@@ -73,7 +73,7 @@
 
     %% Experiment Start
     cfg = getExperimentStart(cfg);
-    
+
     getResponse('start', cfg.keyboard.responseBox);
 
     WaitSecs(cfg.onsetDelay);
@@ -121,27 +121,8 @@
             responseEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
                 getOnlyPress);
 
-            if isfield(responseEvents(1), 'onset') && ~isempty(responseEvents(1).onset)
-
-                for iResp = 1:size(responseEvents, 1)
-                    responseEvents(iResp).onset = ...
-                        responseEvents(iResp).onset - cfg.experimentStart;
-                    responseEvents(iResp).event = 'n/a';
-                    responseEvents(iResp).block = 'n/a';
-                    responseEvents(iResp).direction = 'n/a';
-                    responseEvents(iResp).speed = 'n/a';
-                    responseEvents(iResp).target = 'n/a';
-                    if strcmp(responseEvents(iResp).keyName, 't')
-                        responseEvents(iResp).trial_type = ...
-                            ['trigger_' cfg.design.blockNames{iBlock}];
-                    end
-                end
-
-                responseEvents(1).fileID = logFile.fileID;
-                responseEvents(1).extraColumns = logFile.extraColumns;
-                saveEventsFile('save', cfg, responseEvents);
-
-            end
+            triggerString = ['trigger_' cfg.design.blockNames{iBlock}];
+            saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString);
 
             % wait for the inter-stimulus interval
             WaitSecs(cfg.ISI);
@@ -156,26 +137,8 @@
         triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
             getOnlyPress);
 
-        if isfield(triggerEvents(1), 'onset') && ~isempty(triggerEvents(1).onset)
-
-            for iResp = 1:size(triggerEvents, 1)
-                triggerEvents(iResp).onset = ...
-                    triggerEvents(iResp).onset - cfg.experimentStart;
-                triggerEvents(iResp).event = 'n/a';
-                triggerEvents(iResp).block = 'n/a';
-                triggerEvents(iResp).direction = 'n/a';
-                triggerEvents(iResp).speed = 'n/a';
-                triggerEvents(iResp).target = 'n/a';
-                if strcmp(triggerEvents(iResp).keyName, 't')
-                    triggerEvents(iResp).trial_type = 'trigger_baseline';
-                end
-            end
-
-            triggerEvents(1).fileID = logFile.fileID;
-            triggerEvents(1).extraColumns = logFile.extraColumns;
-            saveEventsFile('save', cfg, triggerEvents);
-
-        end
+        triggerString = 'trigger_baseline';
+        saveResponsesAndTriggers(triggerEvents, cfg, logFile, triggerString);
 
     end