Commit bb134b6d authored by Michael Kohnen's avatar Michael Kohnen

Merge branch 'master' of http://git.rwth-aachen.de/ita/toolbox

parents 36feb18d 0505f97a
......@@ -51,12 +51,15 @@ ms.twait = 0.03;
coords = ita_generateSampling_equiangular(5,5);
coords_cut = coords.n(coords.theta_deg == 90);
iMS.measurementSetup = ms;
iMS.measurementPositions = coords_cut;
iMS.waitBeforeMeasurement = 1;
saveName = 'test';
iMS.dataPath = saveName;
iMS.reference;
iMS.doSorting = 0;
iMS.run;
% always leave the turntable in reference position
......
......@@ -183,7 +183,7 @@ classdef itaMotorNanotec_HRTFarc < itaMotorNanotec
sArgs = this.sArgs_default_motor;
sArgs.continuous = false;
if ~isempty(varargin)
sArgs = ita_parse_arguments(sArgs,varargin);
[sArgs,~] = ita_parse_arguments(sArgs,varargin);
end
if sArgs.continuous
ret = this.prepare_move(position, sArgs);
......
......@@ -158,7 +158,7 @@ classdef itaMotorNanotec_Turntable < itaMotorNanotec
sArgs.direct = true;
sArgs.speed = this.sArgs_default_motor.speed;
if ~isempty(varargin)
sArgs = ita_parse_arguments(sArgs,varargin);
[sArgs,~] = ita_parse_arguments(sArgs,varargin);
end
if sArgs.continuous
ret = this.prepare_move(position, 'speed', sArgs.speed,'continuous', true);
......
......@@ -266,9 +266,12 @@ classdef itaValue
res = 'W/m^2';
val = 1e-12;
log_prefix = 10;
case 'm/s'
case 'm/s' % ISO 1683
res = '1nm/s';
val = 1e-9;
case 'm/s^2' % ISO 1683
res = '1um/s^2';
val = 1e-6;
case 'Pa'
res = '20uPa';
val = 20e-6;
......
......@@ -111,7 +111,6 @@ if ~allIsWell %pdi: performance reasons
R_l = R_mol/M_r; % [J/(kg*K)] gas constant for dry air
R_d = itaValue(461,'J/kg*K'); % gas constant of water vapor
R_f = R_l/(1-(h/100)*(1-R_l/R_d)); % [J/(kg K)] gas constant for air with relative humidity phi
R_f_mol = R_f*M_r; % [N m / (mol K)] molar gas constant for air with rel. humidity
kappa = 1.4; % heat capacity ratio
nu = itaValue(0.0261,'W/(m*K)');%#ok<NASGU> % heat conductivity
C_v = itaValue(718,'J/(kg*K)');%#ok<NASGU> % specific heat capacity
......@@ -130,7 +129,7 @@ if ~allIsWell %pdi: performance reasons
constants.p_stat = sArgs.p;
%% Speed of sound
constants.c = sqrt(kappa*R_f_mol*sArgs.T/M_r);
constants.c = sqrt(kappa*R_f*sArgs.T);
c = constants.c;
%% Air attenuation
......@@ -183,9 +182,9 @@ end
for idx = 1:numel(sArgs.what)
if isfield(constants,lower(sArgs.what{idx}))
varargout{idx} = constants.(sArgs.what{idx});
varargout{idx} = constants.(sArgs.what{idx}); %#ok<AGROW>
elseif strcmpi(sArgs.what{idx},'all')
varargout{idx} = constants;
varargout{idx} = constants; %#ok<AGROW>
else
error([thisFuncStr ' I dont know that constant yet, please teach me!']);
end
......
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