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

Author: marcobarilari

initEnv.m

@@ -88,6 +88,7 @@ function addDependencies()
     pth = fileparts(mfilename('fullpath'));
     addpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src'));
     addpath(fullfile(pth, 'lib', 'CPP_PTB'));
+    addpath(genpath(fullfile(pth, 'lib', 'CPP_PTB', 'src')));
     addpath(fullfile(pth, 'subfun'));
 
 end

setParameters.m

@@ -11,7 +11,7 @@
         'output');
 
     %% Debug mode settings
-    
+
     cfg.debug.do = true; % To test the script out of the scanner, skip PTB sync
     cfg.debug.smallWin = false; % To test on a part of the screen, change to 1
     cfg.debug.transpWin = true; % To test with trasparent full size screen
@@ -34,23 +34,32 @@
 
     %% Experiment Design
 
+    %     cfg.design.motionType = 'translation';
+    %     cfg.design.motionType = 'radial';
+    cfg.design.motionType = 'translation';
     cfg.design.names = {'static'; 'motion'};
     cfg.design.nbRepetitions = 4;
     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 = .5; % 8;
+    cfg.IBI = 1.8 * 3; % 8;
     % Time between events in secs
-    cfg.ISI = 0.5;
+    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 = 1; % second
-    
+    cfg.eventDuration = 0.8; % second
+
     %% Visual Stimulation
 
     % Speed in visual angles / second
@@ -91,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 = [];
 
@@ -112,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 = [];

subfun/doDotMo.m

@@ -33,7 +33,7 @@
         % We assumed that zero is at the top left, but we want it to be
         %  in the center, so shift the dots up and left, which just means
         %  adding half of the screen width in pixel to both the x and y direction.
-        thisEvent.dot.positions = (dots.positions - cfg.screen.winWidth / 2)';
+        thisEvent.dot.positions = (dots.positions - cfg.dot.matrixWidth / 2)';
 
         %% make textures
         dotTexture('make', cfg, thisEvent);
@@ -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)