rename and move around vars

Author: marcobarilari

setParameters.m

@@ -32,30 +32,38 @@
     % MRI settings
     cfg = setMRI(cfg);
 
-    cfg.audio.channels = 2;
-
     %% Experiment Design
-    cfg.names              = {'static', 'motion'};
-    cfg.possibleDirections = [-1 1]; % 1 motion , -1 static
-    cfg.numBlocks          = size(cfg.possibleDirections, 2);
-    cfg.numRepetitions     = 1;      % AT THE MOMENT IT IS NOT SET IN THE MAIN SCRIPT
+
+    cfg.design.names              = {'static', 'motion'};
+    cfg.design.possibleDirections = [-1 1]; % 1 motion , -1 static
+    cfg.design.numBlocks          = size(cfg.possibleDirections, 2); % TO CHECK
+    cfg.design.numRepetitions     = 1;  % AT THE MOMENT IT IS NOT SET IN THE MAIN SCRIPT
+    cfg.design.nbEventsPerBlock   = 12;
 
     %% Timing
-    cfg.IBI                = 0; % 8;
-    cfg.ISI                = 0.1;    % Time between events in secs
-    cfg.onsetDelay         = 1;      % Number of seconds before the motion stimuli are presented
-    cfg.endDelay           = 1;      % Number of seconds after the end all the stimuli before ending the run
+
+    % 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.timing.IBI = 1.8 * 3; % 8;
+    % Time between events in secs
+    cfg.timing.ISI = 0.1;
+    % Number of seconds before the motion stimuli are presented
+    cfg.timing.onsetDelay = .1;
+    % Number of seconds after the end all the stimuli before ending the run
+    cfg.timing.endDelay = .1;
 
     %% Auditory Stimulation
 
-    % expParameters.experimentType    = 'Gratings';  %Dots/Gratings % Visual modality is in RDKs %NOT USED IN THE MAIN SCIPT
-    cfg.speedEvent        = 8;       % speed in visual angles
-    cfg.numEventsPerBlock = 12;      % Number of events per block (should not be changed)
-    cfg.eventDuration     = 10;
+    cfg.audio.channels = 2;
 
-    %% Task
+    %% Task(s)
 
-    cfg.task.name = 'visual localizer';
+    cfg.task.name = 'auditory localizer';
 
     % Instruction
     cfg.task.instruction = '1-Detect the RED fixation cross\n \n\n';
@@ -76,6 +84,26 @@
 
 end
 
+function cfg = setMonitor(cfg)
+
+    % Monitor parameters for PTB
+    cfg.color.white = [255 255 255];
+    cfg.color.black = [0 0 0];
+    cfg.color.red = [255 0 0];
+    cfg.color.grey = mean([cfg.color.black; cfg.color.white]);
+    cfg.color.background = cfg.color.black;
+    cfg.text.color = cfg.color.white;
+
+    % Monitor parameters
+    cfg.screen.monitorWidth = 50; % in cm
+    cfg.screen.monitorDistance = 40; % distance from the screen in cm
+
+    if strcmpi(cfg.testingDevice, 'mri')
+        cfg.screen.monitorWidth = 50;
+        cfg.screen.monitorDistance = 40;
+    end
+end
+
 function cfg = setKeyboards(cfg)
     cfg.keyboard.escapeKey = 'ESCAPE';
     cfg.keyboard.responseKey = {'space', 't'};
@@ -99,23 +127,3 @@
     cfg.bids.MRI.TaskDescription = [];
 
 end
-
-function cfg = setMonitor(cfg)
-
-    % Monitor parameters for PTB
-    cfg.color.white = [255 255 255];
-    cfg.color.black = [0 0 0];
-    cfg.color.red = [255 0 0];
-    cfg.color.grey = mean([cfg.color.black; cfg.color.white]);
-    cfg.color.background = cfg.color.black;
-    cfg.text.color = cfg.color.white;
-
-    % Monitor parameters
-    cfg.screen.monitorWidth = 50; % in cm
-    cfg.screen.monitorDistance = 40; % distance from the screen in cm
-
-    if strcmpi(cfg.testingDevice, 'mri')
-        cfg.screen.monitorWidth = 50;
-        cfg.screen.monitorDistance = 40;
-    end
-end