Aufgrund eines Versionsupdates wird GitLab am 01.04. zwischen 9:00 und 9:30 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to a version upgrade, GitLab won't be accessible at 01.04. between 9:00 and 9:30 a.m.

Commit daa589ac authored by Lukas Aspöck's avatar Lukas Aspöck

fixed / updated generateExampleDirectivities file for DAFFv15

parent 2cf9ac45
...@@ -439,7 +439,7 @@ else ...@@ -439,7 +439,7 @@ else
% Create an empty helper dataset, which contains all directions % Create an empty helper dataset, which contains all directions
% (angular pairs). Then we can just iterate over all records, % (angular pairs). Then we can just iterate over all records,
% making iteration over directions a lot less complicated % making iteration over directions a lot less complicated
props.dataset = daff_create_dataset('channels', props.channels, ... props.dataset = daffv15_create_dataset('channels', props.channels, ...
'alpharange', props.alpharange, ... 'alpharange', props.alpharange, ...
'alphapoints', props.alphapoints, ... 'alphapoints', props.alphapoints, ...
'betarange', props.betarange, ... 'betarange', props.betarange, ...
...@@ -542,7 +542,9 @@ if strcmpi(props.content, 'MS') ...@@ -542,7 +542,9 @@ if strcmpi(props.content, 'MS')
% Frequencies must be provided % Frequencies must be provided
if ~isfield(props.dataset, 'freqs') if ~isfield(props.dataset, 'freqs')
error('When writing magnitude spectrum content, you must specify ''freqs'''); warning('When writing magnitude spectrum content, you should specify ''freqs''');
warning('Frequency vector set to ANSI center frequencies (20 Hz - 20 kHz)');
props.dataset.freqs = ita_ANSI_center_frequencies;
end end
props.numfreqs = length(props.dataset.freqs); props.numfreqs = length(props.dataset.freqs);
......
...@@ -18,7 +18,7 @@ function [ freqs, mags, metadata ] = dfBulbMS( alpha, beta, basepath ) ...@@ -18,7 +18,7 @@ function [ freqs, mags, metadata ] = dfBulbMS( alpha, beta, basepath )
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'magnitude spectrum of bulb shape for higher frequencies';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDiscMS( alpha, beta, basepath ) ...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDiscMS( alpha, beta, basepath )
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'magnitude spectrum in cube shape weighted by frequency (for fun!)';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDipoleMS( alpha, beta, basepath ) ...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDipoleMS( alpha, beta, basepath )
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Dipole magnitude spectrum weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDiscMS( alpha, beta, basepath ) ...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDiscMS( alpha, beta, basepath )
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'magnitude spectrum in disc shape weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfFrontalDiracMS( alpha, beta, basepath ) ...@@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfFrontalDiracMS( alpha, beta, basepath )
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Dirac in frontal direction magnitude spectrum weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfFrontalHemisphereMS( alpha, beta, basepat ...@@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfFrontalHemisphereMS( alpha, beta, basepat
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Dirac in frontal direction magnitude spectrum weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfOmnidirectionalMS( alpha, beta, basepath ...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfOmnidirectionalMS( alpha, beta, basepath
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Omnidirectional magnitude spectrum weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDipoleMS( alpha, beta, basepath ) ...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDipoleMS( alpha, beta, basepath )
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Quadrupole magnitude spectrum weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfStarMS( alpha, beta, basepath ) ...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfStarMS( alpha, beta, basepath )
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Example magnitude spectrum in star shape weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfOmnidirectionalMS( alpha, beta, basepath ...@@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfOmnidirectionalMS( alpha, beta, basepath
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Omnidirectional magnitude spectrum';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfUpperHemisphereMS( alpha, beta, basepath ...@@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfUpperHemisphereMS( alpha, beta, basepath
channels = 1; channels = 1;
mags = zeros(channels, length(freqs)); mags = zeros(channels, length(freqs));
metadata = []; metadata.desc = 'Upper hemisphere magnitude spectrum weighted by frequency';
for c=1:channels for c=1:channels
for f=1:length(freqs) for f=1:length(freqs)
......
...@@ -25,7 +25,7 @@ channels = 1; ...@@ -25,7 +25,7 @@ channels = 1;
orient = [0 0 0]; orient = [0 0 0];
daff_write('filename', '../MS Frontal dirac.daff', ... daffv15_write('filename', '../MS Frontal dirac.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfFrontalDiracMS, ... 'datafunc', @dfFrontalDiracMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -33,7 +33,7 @@ daff_write('filename', '../MS Frontal dirac.daff', ... ...@@ -33,7 +33,7 @@ daff_write('filename', '../MS Frontal dirac.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Frontal hemisphere.daff', ... daffv15_write('filename', '../MS Frontal hemisphere.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfFrontalHemisphereMS, ... 'datafunc', @dfFrontalHemisphereMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -41,7 +41,7 @@ daff_write('filename', '../MS Frontal hemisphere.daff', ... ...@@ -41,7 +41,7 @@ daff_write('filename', '../MS Frontal hemisphere.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Upper hemisphere.daff', ... daffv15_write('filename', '../MS Upper hemisphere.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfUpperHemisphereMS, ... 'datafunc', @dfUpperHemisphereMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -49,7 +49,7 @@ daff_write('filename', '../MS Upper hemisphere.daff', ... ...@@ -49,7 +49,7 @@ daff_write('filename', '../MS Upper hemisphere.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Omnidirectional.daff', ... daffv15_write('filename', '../MS Omnidirectional.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfOmnidirectionalMS, ... 'datafunc', @dfOmnidirectionalMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -57,7 +57,7 @@ daff_write('filename', '../MS Omnidirectional.daff', ... ...@@ -57,7 +57,7 @@ daff_write('filename', '../MS Omnidirectional.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Dipole.daff', ... daffv15_write('filename', '../MS Dipole.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfDipoleMS, ... 'datafunc', @dfDipoleMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -65,7 +65,7 @@ daff_write('filename', '../MS Dipole.daff', ... ...@@ -65,7 +65,7 @@ daff_write('filename', '../MS Dipole.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Quadrupole.daff', ... daffv15_write('filename', '../MS Quadrupole.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfQuadrupoleMS, ... 'datafunc', @dfQuadrupoleMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -73,7 +73,7 @@ daff_write('filename', '../MS Quadrupole.daff', ... ...@@ -73,7 +73,7 @@ daff_write('filename', '../MS Quadrupole.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Star.daff', ... daffv15_write('filename', '../MS Star.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfStarMS, ... 'datafunc', @dfStarMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -81,7 +81,7 @@ daff_write('filename', '../MS Star.daff', ... ...@@ -81,7 +81,7 @@ daff_write('filename', '../MS Star.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Disc.daff', ... daffv15_write('filename', '../MS Disc.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfDiscMS, ... 'datafunc', @dfDiscMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -89,7 +89,7 @@ daff_write('filename', '../MS Disc.daff', ... ...@@ -89,7 +89,7 @@ daff_write('filename', '../MS Disc.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Cube.daff', ... daffv15_write('filename', '../MS Cube.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfCubeMS, ... 'datafunc', @dfCubeMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -97,7 +97,7 @@ daff_write('filename', '../MS Cube.daff', ... ...@@ -97,7 +97,7 @@ daff_write('filename', '../MS Cube.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Bulb.daff', ... daffv15_write('filename', '../MS Bulb.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfBulbMS, ... 'datafunc', @dfBulbMS, ...
'channels', channels, ... 'channels', channels, ...
...@@ -105,7 +105,7 @@ daff_write('filename', '../MS Bulb.daff', ... ...@@ -105,7 +105,7 @@ daff_write('filename', '../MS Bulb.daff', ...
'betares', beta_res, ... 'betares', beta_res, ...
'orient', orient); 'orient', orient);
daff_write('filename', '../MS Thin Belt.daff', ... daffv15_write('filename', '../MS Thin Belt.daff', ...
'content', 'ms', ... 'content', 'ms', ...
'datafunc', @dfOmnidirectionalMS, ... 'datafunc', @dfOmnidirectionalMS, ...
'channels', channels, ... 'channels', channels, ...
......
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