Merge pull request #22 from marcobarilari/marco_audio-file-load

update loadAudioFiles and doAuditoryMotion for the new sounds

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

input/Motion/sub-ctrl666/rms_sub-ctrl666_D.wav

@@ -0,0 +1,81 @@
+function equateRmsWav(subjName)
+    % function equateRmsWav(subjName)
+    % Not used during the experiment itself but allows to root mean square the sounds of a given
+    % subject.
+    if nargin < 1
+        subjName = input('Enter Subjects name: ', 's');
+    end
+
+    referenceDir = fullfile(pwd, 'Static');
+    subjectDir = fullfile(pwd, ['Motion/sub-', subjName]);
+
+    % reference folder (Static)
+    cd(referenceDir);
+    referenceWavFn = fullfile(pwd, 'Static.wav');
+
+    % Subject motion folder
+    cd(subjectDir);
+
+    targetWavFn = ['sub-', subjName, '_LRL.wav'];
+    runFunction(referenceWavFn, targetWavFn);
+
+    targetWavFn = [subjName, '_RLR.wav'];
+    runFunction(referenceWavFn, targetWavFn);
+
+    % Targets
+    cd(referenceDir);
+    referenceWavFn = fullfile(pwd, 'Static_T.wav');
+
+    cd(subjectDir);
+
+    targetWavFn = [subjName, '_LRL_T.wav'];
+    runFunction(referenceWavFn, targetWavFn);
+
+    targetWavFn = [subjName, '_RLR_T.wav'];
+    runFunction(referenceWavFn, targetWavFn);
+
+end
+
+function runFunction (referenceWavFn, targetWavFn)
+    % This Script takes a file (targetWavFn) and equates its rms with
+    % another reference audio file (referenceWavFn) amd gives the equated
+    % wav file as an output ('final_wave.wav')
+
+    % Get the rms of the original sound
+    [referenceWav, referenceFs] = audioread(referenceWavFn);
+    referenceRMS = rms(referenceWav);
+    disp('rms of the reference wav file');
+    disp(referenceRMS);
+
+    % Get the rms for the edited combined sound (static)
+    [targetWav, ~] = audioread(targetWavFn);
+    targetRms = rms(targetWav);
+    disp('rms of the target wav file');
+    disp(targetRms);
+
+    % correct for the rms differences in each channel
+    finalWav = [targetWav(:, 1) * (referenceRMS(1) / targetRms(1)) ...
+                   targetWav(:, 2) * (referenceRMS(2) / targetRms(2))];
+
+    % check that the rms of the final is similar to the original
+    finalRms = rms(finalWav);
+    disp('rms of the final wav file');
+    disp(finalRms);
+
+    audiowrite([targetWavFn(1:end - 4), '_rms.wav'], finalWav, eferenceFs);
+
+    %% plot the reference wav and final wav files
+    figure();
+    subplot(2, 1, 1);
+    plot(referenceWav(:, 1), 'r');
+    hold on;
+    plot(referenceWav(:, 2), 'b');
+    title('Reference wav file');
+
+    subplot(2, 1, 2);
+    plot(finalWav(:, 1), 'r');
+    hold on;
+    plot(finalWav(:, 2), 'b');
+    title('Final wav file');
+
+end

input/Motion/sub-ctrl666/rms_sub-ctrl666_D_T.wav

@@ -12,7 +12,7 @@
 
     %% Debug mode settings
 
-    cfg.debug.do = false; % To test the script out of the scanner, skip PTB sync
+    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 = false; % To test with trasparent full size screen
 
@@ -21,7 +21,7 @@
     %% Engine parameters
 
     cfg.testingDevice = 'mri';
-    cfg.eyeTracker.do = true;
+    cfg.eyeTracker.do = false;
     cfg.audio.do = true;
 
     cfg = setMonitor(cfg);
@@ -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;
 

input/Motion/sub-ctrl666/rms_sub-ctrl666_L.wav

@@ -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
 

input/Motion/sub-ctrl666/rms_sub-ctrl666_L_T.wav

@@ -19,50 +19,34 @@
     soundData.S = soundData.S';
 
     % motion input
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_U.wav']);
-    [soundData.U, freq2] = audioread(fileName);
-    soundData.U = soundData.U';
+    fileName = fullfile('input', 'Motion', subjName, [subjName, '_LRL_rms.wav']);
+    [soundData.LRL, freq2] = audioread(fileName);
+    soundData.LRL = soundData.LRL';
 
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_D.wav']);
-    [soundData.D, freq3] = audioread(fileName);
-    soundData.D = soundData.D';
-
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_R.wav']);
-    [soundData.R, freq4] = audioread(fileName);
-    soundData.R = soundData.R';
-
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_L.wav']);
-    [soundData.L, freq5] = audioread(fileName);
-    soundData.L = soundData.L';
+    fileName = fullfile('input', 'Motion', subjName, [subjName, '_RLR_rms.wav']);
+    [soundData.RLR, freq3] = audioread(fileName);
+    soundData.RLR = soundData.RLR';
 
     %% Targets
 
     % static Stimuli
     fileName = fullfile('input', 'Static', 'Static_T.wav');
-    [soundData.S_T, freq6] = audioread(fileName);
+    [soundData.S_T, freq4] = audioread(fileName);
     soundData.S_T = soundData.S_T';
 
     % motion Stimuli
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_U_T.wav']);
-    [soundData.U_T, freq7] = audioread(fileName);
-    soundData.U_T = soundData.U_T';
-
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_D_T.wav']);
-    [soundData.D_T, freq8] = audioread(fileName);
-    soundData.D_T = soundData.D_T';
-
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_R_T.wav']);
-    [soundData.R_T, freq9] = audioread(fileName);
-    soundData.R_T = soundData.R_T';
+    fileName = fullfile('input', 'Motion', subjName, [subjName, '_LRL_T_rms.wav']);
+    [soundData.LRL_T, freq5] = audioread(fileName);
+    soundData.LRL_T = soundData.LRL_T';
 
-    fileName = fullfile('input', 'Motion', subjName, ['rms_', subjName, '_L_T.wav']);
-    [soundData.L_T, freq10] = audioread(fileName);
-    soundData.L_T = soundData.L_T';
+    fileName = fullfile('input', 'Motion', subjName, [subjName, '_RLR_T_rms.wav']);
+    [soundData.RLR_T, freq6] = audioread(fileName);
+    soundData.RLR_T = soundData.RLR_T';
 
-    if length(unique([freq1 freq2 freq3 freq4 freq5 freq6 freq7 freq8 freq9 freq10])) > 1
-        error ('Sounds dont have the same frequency');
+    if length(unique([freq1 freq2 freq3 freq4 freq5 freq6])) > 1
+        error ('Sounds do not have the same frequency');
     else
-        freq = unique([freq1 freq2 freq3 freq4 freq5 freq6 freq7 freq8 freq9 freq10]);
+        freq = unique([freq1 freq2 freq3 freq4 freq5 freq6]);
     end
 
     cfg.soundData = soundData;