mh fix

Author: marcobarilari

input/equateRmsWav.m

@@ -4,8 +4,8 @@ function equateRmsWav(subjName)
         subjName = input('Enter Subjects name: ', 's');
     end
 
-    referenceDir = fullfile(pwd,'Static');
-    subjectDir = fullfile(pwd,['Motion/sub-', subjName]);
+    referenceDir = fullfile(pwd, 'Static');
+    subjectDir = fullfile(pwd, ['Motion/sub-', subjName]);
 
     % reference folder (Static)
     cd(referenceDir);
@@ -15,70 +15,65 @@ function equateRmsWav(subjName)
     cd(subjectDir);
 
     targetWavFn = ['sub-', subjName, '_LRL.wav'];
-    runFunction (referenceWavFn, targetWavFn)
+    runFunction(referenceWavFn, targetWavFn);
 
     targetWavFn = [subjName, '_RLR.wav'];
-    runFunction (referenceWavFn, targetWavFn)
+    runFunction(referenceWavFn, targetWavFn);
 
     % Targets
     cd(referenceDir);
     referenceWavFn = fullfile(pwd, 'Static_T.wav');
 
-    %target_wav_fn = ['M.wav'];
     cd(subjectDir);
 
     targetWavFn = [subjName, '_LRL_T.wav'];
-    runFunction (referenceWavFn,targetWavFn)
+    runFunction(referenceWavFn, targetWavFn);
 
     targetWavFn = [subjName, '_RLR_T.wav'];
-    runFunction (referenceWavFn, targetWavFn)
+    runFunction(referenceWavFn, targetWavFn);
 
-    end
+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')
 
-    %reference_wav_fn = 'R_L.wav';
-    %target_wav_fn = 'L_R.wav';
-
     % Get the rms of the original sound
-    [referenceWav, referenceFs]= audioread(referenceWavFn);
+    [referenceWav, referenceFs] = audioread(referenceWavFn);
     referenceRMS = rms(referenceWav);
-    disp('rms of the reference wav file')
-    disp(referenceRMS)
+    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)
-
+    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))];
+    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);
+    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')
+    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

setParameters.m

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

subfun/doAuditoryMotion.m

@@ -21,11 +21,11 @@
     isFixationTarget = thisEvent.fixationTarget(1);
     targetDuration = cfg.target.duration;
 
-    % % % WIP % % % 
-    
+    % % % WIP % % %
+
     % isSoundTarget = thisEvent.soundTarget(1);
-    
-    % % % WIP % % % 
+
+    % % % WIP % % %
 
     soundData = cfg.soundData;
 
@@ -39,11 +39,11 @@
     end
 
     % % % WIP % % %
-    
-%     if isSoundTarget == 1
-%         fieldName = [fieldName '_T'];
-%     end
-    
+
+    % if isSoundTarget == 1
+    %     fieldName = [fieldName '_T'];
+    % end
+
     % % % WIP % % %
 
     sound = soundData.(fieldName);

subfun/loadAudioFiles.m

@@ -12,18 +12,18 @@
     end
 
     %% Load the sounds
-    
+
     % static Stimuli
     fileName = fullfile('input', 'Static', 'Static.wav');
     [soundData.S, freq1] = audioread(fileName);
     soundData.S = soundData.S';
 
     % motion input
-    fileName = fullfile('input', 'Motion', subjName, [ subjName, '_LRL_rms.wav']);
+    fileName = fullfile('input', 'Motion', subjName, [subjName, '_LRL_rms.wav']);
     [soundData.LRL, freq2] = audioread(fileName);
     soundData.LRL = soundData.LRL';
 
-    fileName = fullfile('input', 'Motion', subjName, [ subjName, '_RLR_rms.wav']);
+    fileName = fullfile('input', 'Motion', subjName, [subjName, '_RLR_rms.wav']);
     [soundData.RLR, freq3] = audioread(fileName);
     soundData.RLR = soundData.RLR';
 
@@ -35,18 +35,18 @@
     soundData.S_T = soundData.S_T';
 
     % motion Stimuli
-    fileName = fullfile('input', 'Motion', subjName, [ subjName, '_LRL_T_rms.wav']);
+    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, [ subjName, '_RLR_T_rms.wav']);
+    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 ])) > 1
+    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 ]);
+        freq = unique([freq1 freq2 freq3 freq4 freq5 freq6]);
     end
 
     cfg.soundData = soundData;