Merge pull request #25 from marcobarilari/marco_task2-soundTarget

add Task #2 - shorter sound

Author: marcobarilari

audioLocTranslational.m

@@ -83,12 +83,7 @@
             thisEvent.trial_type = cfg.design.blockNames{iBlock};
             thisEvent.direction = cfg.design.directions(iBlock, iEvent);
             thisEvent.fixationTarget = cfg.design.fixationTargets(iBlock, iEvent);
-
-            % % % WIP % % %
-
-            % thisEvent.soundTarget = cfg.design.soundTargets(iBlock, iEvent);
-
-            % % % WIP % % %
+            thisEvent.soundTarget = cfg.design.soundTargets(iBlock, iEvent);
 
             % we wait for a trigger every 2 events
             if cfg.pacedByTriggers.do && mod(iEvent, 2) == 1

setParameters.m

@@ -91,7 +91,8 @@
     cfg.task.name = 'auditory localizer';
 
     % Instruction
-    cfg.task.instruction = '1-Detect the RED fixation cross\n \n\n';
+    cfg.task.instruction = ['1 - Detect the RED fixation cross\n' ...
+      '2 - Detected the shorter repeated sounds'];
 
     % Fixation cross (in pixels)
     cfg.fixation.type = 'cross';
@@ -105,7 +106,7 @@
     cfg.target.maxNbPerBlock = 2;
     cfg.target.duration = 0.5; % In secs
 
-    cfg.extraColumns = {'direction', 'speed', 'target', 'event', 'block', 'keyName'};
+    cfg.extraColumns = {'direction', 'soundTarget', 'fixationTarget', 'event', 'block', 'keyName'};
 
 end
 
@@ -151,7 +152,8 @@
 
     cfg.mri.repetitionTime = 1.8;
 
-    cfg.bids.MRI.Instructions = 'Detect the RED fixation cross';
+    cfg.bids.MRI.Instructions = ['1 - Detect the RED fixation cross\n' ...
+      '2 - Detected the shorter repeated sounds'];
     cfg.bids.MRI.TaskDescription = [];
 
 end

subfun/doAuditoryMotion.m

@@ -20,12 +20,7 @@
     direction = thisEvent.direction(1);
     isFixationTarget = thisEvent.fixationTarget(1);
     targetDuration = cfg.target.duration;
-
-    % % % WIP % % %
-
-    % isSoundTarget = thisEvent.soundTarget(1);
-
-    % % % WIP % % %
+    isSoundTarget = thisEvent.soundTarget(1);
 
     soundData = cfg.soundData;
 
@@ -38,13 +33,9 @@
             fieldName = 'RLR';
     end
 
-    % % % WIP % % %
-
-    % if isSoundTarget == 1
-    %     fieldName = [fieldName '_T'];
-    % end
-
-    % % % WIP % % %
+    if isSoundTarget == 1
+        fieldName = [fieldName '_T'];
+    end
 
     sound = soundData.(fieldName);
 

subfun/expDesign.m

@@ -77,14 +77,16 @@
 
         fixationTargets = zeros(NB_BLOCKS, NB_EVENTS_PER_BLOCK);
 
+        soundTargets = zeros(NB_BLOCKS, NB_EVENTS_PER_BLOCK);
+
         for iBlock = 1:NB_BLOCKS
 
             % Set target
             % - if there are 2 targets per block we make sure that they are at least
             % 2 events apart
             % - targets cannot be on the first or last event of a block
-            % - no more than 2 target in the same event order
 
+            % Fixation targets
             nbTarget = numTargetsForEachBlock(iBlock);
 
             chosenPosition = setTargetPositionInSequence( ...
@@ -94,10 +96,20 @@
 
             fixationTargets(iBlock, chosenPosition) = 1;
 
+            % Sound targets
+            nbTarget = numTargetsForEachBlock(iBlock);
+
+            chosenPosition = setTargetPositionInSequence( ...
+                NB_EVENTS_PER_BLOCK, ...
+                nbTarget, ...
+                [1 NB_EVENTS_PER_BLOCK]);
+
+            soundTargets(iBlock, chosenPosition) = 1;
+
         end
 
-        % Check rule 3
-        if max(sum(fixationTargets)) < NB_REPETITIONS - 1
+        % Check that fixation and shorter sound are not presented in the same event
+        if max(unique(fixationTargets + soundTargets)) < 2
             break
         end
 
@@ -112,6 +124,8 @@
 
     cfg.design.fixationTargets = fixationTargets;
 
+    cfg.design.soundTargets = soundTargets;
+
     %% Plot
     diplayDesign(cfg, displayFigs);