Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
12
Issues
12
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
toolbox
Commits
bb134b6d
Commit
bb134b6d
authored
Jan 23, 2019
by
Michael Kohnen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://git.rwth-aachen.de/ita/toolbox
parents
36feb18d
0505f97a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
+13
-8
applications/Binaural-HRTF/HRTFarc/ita_HRTFarc_measurementScript.m
...ons/Binaural-HRTF/HRTFarc/ita_HRTFarc_measurementScript.m
+4
-1
applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_HRTFarc.m
...trol/ClassStuff/itaMotorControl/itaMotorNanotec_HRTFarc.m
+1
-1
applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_Turntable.m
...ol/ClassStuff/itaMotorControl/itaMotorNanotec_Turntable.m
+1
-1
kernel/ClassStuff/@itaValue/itaValue.m
kernel/ClassStuff/@itaValue/itaValue.m
+4
-1
kernel/StandardRoutines/ita_constants.m
kernel/StandardRoutines/ita_constants.m
+3
-4
No files found.
applications/Binaural-HRTF/HRTFarc/ita_HRTFarc_measurementScript.m
View file @
bb134b6d
...
...
@@ -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
...
...
applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_HRTFarc.m
View file @
bb134b6d
...
...
@@ -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
);
...
...
applications/Hardware/ITAMotorControl/ClassStuff/itaMotorControl/itaMotorNanotec_Turntable.m
View file @
bb134b6d
...
...
@@ -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
);
...
...
kernel/ClassStuff/@itaValue/itaValue.m
View file @
bb134b6d
...
...
@@ -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
;
...
...
kernel/StandardRoutines/ita_constants.m
View file @
bb134b6d
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment