Merge pull request #2 from marcobarilari/marco_new-motion-design

PR that will make #22 work with the new sound files

Author: marcobarilari

audioLocTranslational.m

@@ -82,8 +82,13 @@
             % set direction, speed of that event and if it is a target
             thisEvent.trial_type = cfg.design.blockNames{iBlock};
             thisEvent.direction = cfg.design.directions(iBlock, iEvent);
-            % thisEvent.speed = cfg.design.speeds(iBlock, iEvent);
-            thisEvent.target = cfg.design.fixationTargets(iBlock, iEvent);
+            thisEvent.fixationTarget = cfg.design.fixationTargets(iBlock, iEvent);
+            
+            % % % WIP % % % 
+            
+            % thisEvent.soundTarget = cfg.design.soundTargets(iBlock, iEvent);
+            
+            % % % WIP % % % 
 
             % we wait for a trigger every 2 events
             if cfg.pacedByTriggers.do && mod(iEvent, 2) == 1

setParameters.m

@@ -40,7 +40,8 @@
     %     cfg.design.motionType = 'radial';
     cfg.design.motionType = 'translation';
     cfg.design.names = {'static'; 'motion'};
-    cfg.design.motionDirections = [-1 -1 1 1];
+    % 0: L--R--L; 180: R--L--R;
+    cfg.design.motionDirections = [0 0 180 180]; 
     cfg.design.nbRepetitions = 14;
     cfg.design.nbEventsPerBlock = 12;
 

subfun/doAuditoryMotion.m

@@ -18,27 +18,33 @@
     %% Get parameters
 
     direction = thisEvent.direction(1);
-    isTarget = thisEvent.target(1);
+    isFixationTarget = thisEvent.fixationTarget(1);
     targetDuration = cfg.target.duration;
 
+    % % % WIP % % % 
+    
+    % isSoundTarget = thisEvent.soundTarget(1);
+    
+    % % % WIP % % % 
+
     soundData = cfg.soundData;
 
     switch direction
         case -1
             fieldName = 'S';
-        case 90
-            fieldName = 'U';
-        case 270
-            fieldName = 'D';
         case 0
-            fieldName = 'R';
+            fieldName = 'LRL';
         case 180
-            fieldName = 'L';
+            fieldName = 'RLR';
     end
 
-    if isTarget == 1
-        fieldName = [fieldName '_T'];
-    end
+    % % % WIP % % %
+    
+%     if isSoundTarget == 1
+%         fieldName = [fieldName '_T'];
+%     end
+    
+    % % % WIP % % %
 
     sound = soundData.(fieldName);
 
@@ -51,7 +57,7 @@
     % ideally we would want to synch that first time stamp and the sound start
     thisFixation.fixation = cfg.fixation;
     thisFixation.screen = cfg.screen;
-    if isTarget == 1
+    if isFixationTarget == 1
         thisFixation.fixation.color = cfg.fixation.colorTarget;
     end
     drawFixation(thisFixation);
@@ -62,7 +68,7 @@
         % set default cross cross color but update if target time is not
         % finished
         thisFixation.fixation.color = cfg.fixation.color;
-        if GetSecs < (onset + targetDuration) && isTarget == 1
+        if GetSecs < (onset + targetDuration) && isFixationTarget == 1
             thisFixation.fixation.color = cfg.fixation.colorTarget;
         end