collect trigger in the same file as responses

Author: Remi-Gau

lib/CPP_BIDS

@@ -42,18 +42,24 @@
     cfg.design.nbEventsPerBlock = 12; % DO NOT CHANGE
 
     %% Timing
+    
+    % FOR 7T: if you want to create localizers on the fly, the following must be
+    % multiples of the scanneryour sequence TR
+    % 
+    % IBI
+    % block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock
 
     % Time between blocs in secs
-    cfg.IBI = .1; % 8;
+    cfg.IBI = 1.8*3; % 8;
     % Time between events in secs
     cfg.ISI = 0.1;
     % Number of seconds before the motion stimuli are presented
     cfg.onsetDelay = .1;
     % Number of seconds after the end all the stimuli before ending the run
     cfg.endDelay = .1;
 
-    cfg.eventDuration = 3; % second
-
+    cfg.eventDuration = 0.8; % second
+    
     %% Visual Stimulation
 
     % Speed in visual angles / second
@@ -94,13 +100,13 @@
     cfg.target.maxNbPerBlock = 2;
     cfg.target.duration = 0.05; % In secs
 
-    cfg.extraColumns = {'direction', 'speed', 'target', 'event', 'block'};
+    cfg.extraColumns = {'direction', 'speed', 'target', 'event', 'block', 'keyName'};
 
 end
 
 function cfg = setKeyboards(cfg)
     cfg.keyboard.escapeKey = 'ESCAPE';
-    cfg.keyboard.responseKey = {'space'};
+    cfg.keyboard.responseKey = {'space', 't'};
     cfg.keyboard.keyboard = [];
     cfg.keyboard.responseBox = [];
 
@@ -115,7 +121,7 @@
     cfg.mri.triggerKey = 't';
     cfg.mri.triggerNb = 4;
 
-    cfg.mri.repetitionTime = 2;
+    cfg.mri.repetitionTime = 1.8;
 
     cfg.bids.MRI.Instructions = 'Detect the RED fixation cross';
     cfg.bids.MRI.TaskDescription = [];

lib/CPP_PTB

@@ -46,7 +46,8 @@
 
     % dots are displayed on a square with a length in visual angle equal to the
     % field of view
-    cfg.dot.number = round(cfg.dot.density * (cfg.screen.winWidth / cfg.screen.ppd)^2);
+    cfg.dot.number = round(cfg.dot.density * ...
+        (cfg.dot.matrixWidth / cfg.screen.ppd)^2);
 
     [el] = eyeTracker('Calibration', cfg);
 
@@ -55,7 +56,7 @@
     % Prepare for the output logfiles with all
     logFile.extraColumns = cfg.extraColumns;
     logFile = saveEventsFile('open', cfg, logFile);
-
+    
     % prepare textures
     cfg = apertureTexture('init', cfg);
     cfg = dotTexture('init', cfg);
@@ -101,6 +102,7 @@
 
             thisEvent.event = iEvent;
             thisEvent.block = iBlock;
+            thisEvent.keyName = 'n/a';
             thisEvent.duration = duration;
             thisEvent.onset = onset - cfg.experimentStart;
 
@@ -115,32 +117,64 @@
 
             % collect the responses and appends to the event structure for
             % saving in the tsv file
-            responseEvents = collectAndSaveResponses(cfg, logFile, cfg.experimentStart);
-
-            responseEvents = getResponse('check', cfg.keyboard.responseBox, cfg, getOnlyPress);
-
+            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).event = iEvent;
-                    responseEvents(iResp).block = iBlock;
+                    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';
+                    end
                 end
-
+                
+                responseEvents(1).fileID = logFile.fileID;
+                responseEvents(1).extraColumns = logFile.extraColumns;
                 saveEventsFile('save', cfg, responseEvents);
-
+                
             end
-
+            
             % wait for the inter-stimulus interval
             WaitSecs(cfg.ISI);
 
-            getResponse('flush', cfg.keyboard.responseBox);
-
         end
-
+        
         eyeTracker('StopRecordings', cfg);
-
+        
         WaitSecs(cfg.IBI);
+        
+        % trigger monitoring
+        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
+
 
     end