From daa589acc8156496cd79fd8016ae63f62ee3154f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Asp=C3=B6ck?= Date: Mon, 4 Jun 2018 19:03:13 +0200 Subject: [PATCH] fixed / updated generateExampleDirectivities file for DAFFv15 --- .../openDAFF/OpenDAFFv1.5/daffv15_write.m | 6 +++-- .../openDAFF/OpenDAFFv1.5/private/dfBulbMS.m | 2 +- .../openDAFF/OpenDAFFv1.5/private/dfCubeMS.m | 2 +- .../OpenDAFFv1.5/private/dfDipoleMS.m | 2 +- .../openDAFF/OpenDAFFv1.5/private/dfDiscMS.m | 2 +- .../OpenDAFFv1.5/private/dfFrontalDiracMS.m | 3 ++- .../private/dfFrontalHemisphereMS.m | 3 ++- .../private/dfOmnidirectionalMS.m | 2 +- .../OpenDAFFv1.5/private/dfQuadrupoleMS.m | 2 +- .../openDAFF/OpenDAFFv1.5/private/dfStarMS.m | 2 +- .../OpenDAFFv1.5/private/dfUnitySphereMS.m | 2 +- .../private/dfUpperHemisphereMS.m | 3 ++- .../private/generateExampleDirectivities.m | 22 +++++++++---------- 13 files changed, 29 insertions(+), 24 deletions(-) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/daffv15_write.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/daffv15_write.m index 09278c20..33dca005 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/daffv15_write.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/daffv15_write.m @@ -439,7 +439,7 @@ else % Create an empty helper dataset, which contains all directions % (angular pairs). Then we can just iterate over all records, % 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, ... 'alphapoints', props.alphapoints, ... 'betarange', props.betarange, ... @@ -542,7 +542,9 @@ if strcmpi(props.content, 'MS') % Frequencies must be provided 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 props.numfreqs = length(props.dataset.freqs); diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfBulbMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfBulbMS.m index 03c47d28..7473b5b7 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfBulbMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfBulbMS.m @@ -18,7 +18,7 @@ function [ freqs, mags, metadata ] = dfBulbMS( alpha, beta, basepath ) channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'magnitude spectrum of bulb shape for higher frequencies'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfCubeMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfCubeMS.m index b5d5b5fb..2103e107 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfCubeMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfCubeMS.m @@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDiscMS( alpha, beta, basepath ) channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'magnitude spectrum in cube shape weighted by frequency (for fun!)'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDipoleMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDipoleMS.m index 4d319b0f..0794d508 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDipoleMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDipoleMS.m @@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDipoleMS( alpha, beta, basepath ) channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Dipole magnitude spectrum weighted by frequency'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDiscMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDiscMS.m index 29e4979f..3dc96e2b 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDiscMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfDiscMS.m @@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDiscMS( alpha, beta, basepath ) channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'magnitude spectrum in disc shape weighted by frequency'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalDiracMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalDiracMS.m index 5a0f571e..3f7e4fbc 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalDiracMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalDiracMS.m @@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfFrontalDiracMS( alpha, beta, basepath ) channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Dirac in frontal direction magnitude spectrum weighted by frequency'; + for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalHemisphereMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalHemisphereMS.m index 67485ea6..385f83c3 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalHemisphereMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfFrontalHemisphereMS.m @@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfFrontalHemisphereMS( alpha, beta, basepat channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Dirac in frontal direction magnitude spectrum weighted by frequency'; + for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfOmnidirectionalMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfOmnidirectionalMS.m index 4e65a12f..9bc7ccc4 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfOmnidirectionalMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfOmnidirectionalMS.m @@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfOmnidirectionalMS( alpha, beta, basepath channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Omnidirectional magnitude spectrum weighted by frequency'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfQuadrupoleMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfQuadrupoleMS.m index 9a3dc055..40ec784b 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfQuadrupoleMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfQuadrupoleMS.m @@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfDipoleMS( alpha, beta, basepath ) channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Quadrupole magnitude spectrum weighted by frequency'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfStarMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfStarMS.m index 3aa83ce4..701a82e2 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfStarMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfStarMS.m @@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfStarMS( alpha, beta, basepath ) channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Example magnitude spectrum in star shape weighted by frequency'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUnitySphereMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUnitySphereMS.m index 10f508ae..03d1c1ad 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUnitySphereMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUnitySphereMS.m @@ -14,7 +14,7 @@ function [ freqs, mags, metadata ] = dfOmnidirectionalMS( alpha, beta, basepath channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Omnidirectional magnitude spectrum'; for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUpperHemisphereMS.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUpperHemisphereMS.m index 9aff6248..fb7e8584 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUpperHemisphereMS.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/dfUpperHemisphereMS.m @@ -14,7 +14,8 @@ function [ freqs, mags, metadata ] = dfUpperHemisphereMS( alpha, beta, basepath channels = 1; mags = zeros(channels, length(freqs)); - metadata = []; + metadata.desc = 'Upper hemisphere magnitude spectrum weighted by frequency'; + for c=1:channels for f=1:length(freqs) diff --git a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/generateExampleDirectivities.m b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/generateExampleDirectivities.m index 8345ed20..4be2becc 100644 --- a/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/generateExampleDirectivities.m +++ b/applications/VirtualAcoustics/openDAFF/OpenDAFFv1.5/private/generateExampleDirectivities.m @@ -25,7 +25,7 @@ channels = 1; orient = [0 0 0]; -daff_write('filename', '../MS Frontal dirac.daff', ... +daffv15_write('filename', '../MS Frontal dirac.daff', ... 'content', 'ms', ... 'datafunc', @dfFrontalDiracMS, ... 'channels', channels, ... @@ -33,7 +33,7 @@ daff_write('filename', '../MS Frontal dirac.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Frontal hemisphere.daff', ... +daffv15_write('filename', '../MS Frontal hemisphere.daff', ... 'content', 'ms', ... 'datafunc', @dfFrontalHemisphereMS, ... 'channels', channels, ... @@ -41,7 +41,7 @@ daff_write('filename', '../MS Frontal hemisphere.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Upper hemisphere.daff', ... +daffv15_write('filename', '../MS Upper hemisphere.daff', ... 'content', 'ms', ... 'datafunc', @dfUpperHemisphereMS, ... 'channels', channels, ... @@ -49,7 +49,7 @@ daff_write('filename', '../MS Upper hemisphere.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Omnidirectional.daff', ... +daffv15_write('filename', '../MS Omnidirectional.daff', ... 'content', 'ms', ... 'datafunc', @dfOmnidirectionalMS, ... 'channels', channels, ... @@ -57,7 +57,7 @@ daff_write('filename', '../MS Omnidirectional.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Dipole.daff', ... +daffv15_write('filename', '../MS Dipole.daff', ... 'content', 'ms', ... 'datafunc', @dfDipoleMS, ... 'channels', channels, ... @@ -65,7 +65,7 @@ daff_write('filename', '../MS Dipole.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Quadrupole.daff', ... +daffv15_write('filename', '../MS Quadrupole.daff', ... 'content', 'ms', ... 'datafunc', @dfQuadrupoleMS, ... 'channels', channels, ... @@ -73,7 +73,7 @@ daff_write('filename', '../MS Quadrupole.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Star.daff', ... +daffv15_write('filename', '../MS Star.daff', ... 'content', 'ms', ... 'datafunc', @dfStarMS, ... 'channels', channels, ... @@ -81,7 +81,7 @@ daff_write('filename', '../MS Star.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Disc.daff', ... +daffv15_write('filename', '../MS Disc.daff', ... 'content', 'ms', ... 'datafunc', @dfDiscMS, ... 'channels', channels, ... @@ -89,7 +89,7 @@ daff_write('filename', '../MS Disc.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Cube.daff', ... +daffv15_write('filename', '../MS Cube.daff', ... 'content', 'ms', ... 'datafunc', @dfCubeMS, ... 'channels', channels, ... @@ -97,7 +97,7 @@ daff_write('filename', '../MS Cube.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Bulb.daff', ... +daffv15_write('filename', '../MS Bulb.daff', ... 'content', 'ms', ... 'datafunc', @dfBulbMS, ... 'channels', channels, ... @@ -105,7 +105,7 @@ daff_write('filename', '../MS Bulb.daff', ... 'betares', beta_res, ... 'orient', orient); -daff_write('filename', '../MS Thin Belt.daff', ... +daffv15_write('filename', '../MS Thin Belt.daff', ... 'content', 'ms', ... 'datafunc', @dfOmnidirectionalMS, ... 'channels', channels, ... -- GitLab