Merge remote-tracking branch 'cpp-lln-lab/master'

Author: marcobarilari

lib/CPP_BIDS

@@ -50,15 +50,15 @@
     % block length = (cfg.eventDuration + cfg.ISI) * cfg.design.nbEventsPerBlock
 
     % Time between blocs in secs
-    cfg.IBI = 1.8 * 3; % 8;
+    cfg.timing.IBI = 1.8 * 3; % 8;
     % Time between events in secs
-    cfg.ISI = 0.1;
+    cfg.timing.ISI = 0.1;
     % Number of seconds before the motion stimuli are presented
-    cfg.onsetDelay = .1;
+    cfg.timing.onsetDelay = .1;
     % Number of seconds after the end all the stimuli before ending the run
-    cfg.endDelay = .1;
+    cfg.timing.endDelay = .1;
 
-    cfg.eventDuration = 0.8; % second
+    cfg.timing.eventDuration = 0.8; % second
 
     %% Visual Stimulation
 

lib/CPP_PTB

@@ -19,7 +19,7 @@
     dots = initDots(cfg, thisEvent);
 
     % Set for how many frames this event will last
-    framesLeft = floor(cfg.eventDuration / cfg.screen.ifi);
+    framesLeft = floor(cfg.timing.eventDuration / cfg.screen.ifi);
 
     %% Start the dots presentation
     vbl = Screen('Flip', cfg.screen.win);

setParameters.m

@@ -63,6 +63,7 @@
 
     disp(cfg);
 
+    % Show experiment instruction
     standByScreen(cfg);
 
     % prepare the KbQueue to collect responses
@@ -76,7 +77,7 @@
 
     getResponse('start', cfg.keyboard.responseBox);
 
-    WaitSecs(cfg.onsetDelay);
+    WaitSecs(cfg.timing.onsetDelay);
 
     %% For Each Block
 
@@ -125,13 +126,13 @@
             saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString);
 
             % wait for the inter-stimulus interval
-            WaitSecs(cfg.ISI);
+            WaitSecs(cfg.timing.ISI);
 
         end
 
         eyeTracker('StopRecordings', cfg);
 
-        WaitSecs(cfg.IBI);
+        WaitSecs(cfg.timing.IBI);
 
         % trigger monitoring
         triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
@@ -143,7 +144,7 @@
     end
 
     % End of the run for the BOLD to go down
-    WaitSecs(cfg.endDelay);
+    WaitSecs(cfg.timing.endDelay);
 
     cfg = getExperimentEnd(cfg);