Commit d7d0cec2 authored by Joanna Luberadzka's avatar Joanna Luberadzka

added hrir condition (in-ear or front) and a script for measuring machine tresholds

parent 50c9b8e6
...@@ -33,7 +33,7 @@ def.expvardescription = 'signal level'; % description of the tracking variable ...@@ -33,7 +33,7 @@ def.expvardescription = 'signal level'; % description of the tracking variable
% limits for experimental variable % limits for experimental variable
def.minvar = -100; % minimum value of the tracking variable def.minvar = -100; % minimum value of the tracking variable
def.maxvar = 55; % maximum value of the tracking variable def.maxvar = 60; % maximum value of the tracking variable
def.terminate = 1; % terminate execution on min/maxvar hit: 0 = warning, 1 = terminate def.terminate = 1; % terminate execution on min/maxvar hit: 0 = warning, 1 = terminate
def.endstop = 3; % Allows x nominal levels higher/lower than the limits before terminating (if def.terminate = 1) def.endstop = 3; % Allows x nominal levels higher/lower than the limits before terminating (if def.terminate = 1)
......
...@@ -55,15 +55,29 @@ end ...@@ -55,15 +55,29 @@ end
if iscell(setup.ref_angle);setup.ref_angle=cell2mat(setup.ref_angle);end if iscell(setup.ref_angle);setup.ref_angle=cell2mat(setup.ref_angle);end
setup.HRIRs=cell(length(setup.ref_angle),1); % [0 45 90]; setup.HRIRs=cell(length(setup.ref_angle),1); % [0 45 90];
% Condition 4
switch work.userpar4
case 'in-ear'
def.outputChannels=2;
for k=1:length(setup.HRIRs) for k=1:length(setup.HRIRs)
def.outputChannels=2;
%load the hrir for the reference angle %load the hrir for the reference angle
setup.HRIRs{k}.hrir_ref=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k),'in-ear') setup.HRIRs{k}.hrir_ref=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k),'in-ear')
%load the hrirs for the angle 5° away from the reference angle %load the hrirs for the angle 5° away from the reference angle
setup.HRIRs{k}.hrir_refplus=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k)+setup.degdiff,'in-ear') setup.HRIRs{k}.hrir_refplus=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k)+setup.degdiff,'in-ear')
setup.HRIRs{k}.hrir_refminus=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k)-setup.degdiff,'in-ear') setup.HRIRs{k}.hrir_refminus=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k)-setup.degdiff,'in-ear')
end end
case 'front'
def.outputChannels=2;
for k=1:length(setup.HRIRs)
%load the hrir for the reference angle
setup.HRIRs{k}.hrir_ref=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k),'front')
%load the hrirs for the angle 5° away from the reference angle
setup.HRIRs{k}.hrir_refplus=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k)+setup.degdiff,'front')
setup.HRIRs{k}.hrir_refminus=loadHRIR('Anechoic', 300, 0, setup.ref_angle(k)-setup.degdiff,'front')
end
end
% Condition 4 % Condition 4
......
% Measurement script for the machine (localizer)
% in-ear HRIRs
afc('main','experimentDOA','localizer','0','5','ollo_female','in-ear', 'diffuse')
afc('main','experimentDOA','localizer','0','5','ollo_female','in-ear', 'cohnoise')
afc('main','experimentDOA','localizer','0','10','ollo_female','in-ear', 'diffuse')
afc('main','experimentDOA','localizer','0','10','ollo_female','in-ear', 'cohnoise')
afc('main','experimentDOA','localizer','45','10','ollo_female','in-ear', 'diffuse')
afc('main','experimentDOA','localizer','45','10','ollo_female','in-ear', 'cohnoise')
afc('main','experimentDOA','localizer','45','15','ollo_female','in-ear', 'diffuse')
afc('main','experimentDOA','localizer','45','15','ollo_female','in-ear', 'cohnoise')
afc('main','experimentDOA','localizer','45','20','ollo_female','in-ear', 'diffuse')
afc('main','experimentDOA','localizer','45','20','ollo_female','in-ear', 'cohnoise')
% front HG channels HRIRs
afc('main','experimentDOA','localizer','0','5','ollo_female','front', 'diffuse')
afc('main','experimentDOA','localizer','0','5','ollo_female','front', 'cohnoise')
afc('main','experimentDOA','localizer','0','10','ollo_female','front', 'diffuse')
afc('main','experimentDOA','localizer','0','10','ollo_female','front', 'cohnoise')
afc('main','experimentDOA','localizer','45','10','ollo_female','front', 'diffuse')
afc('main','experimentDOA','localizer','45','10','ollo_female','front', 'cohnoise')
afc('main','experimentDOA','localizer','45','15','ollo_female','front', 'diffuse')
afc('main','experimentDOA','localizer','45','15','ollo_female','front', 'cohnoise')
afc('main','experimentDOA','localizer','45','20','ollo_female','front', 'diffuse')
afc('main','experimentDOA','localizer','45','20','ollo_female','front', 'cohnoise')
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment