Skip to content

Commit 8bb6387

Browse files
fs446mgeier
authored andcommitted
examples in array docu, update Rostock WFS array data, PR 97
-Old "university_rostock.csv" as of 2015 is "wfs_university_rostock_2015.csv" now. New measurement data of december 2018 is stored in "wfs_university_rostock_2018" and now includes absolute height (z coordinate, KH120 logo) and weights of the 64 loudspeakers.
1 parent 4395c15 commit 8bb6387

6 files changed

+242
-26
lines changed

data/arrays/example_array_4LS_2D.csv

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
1,0,0,-1,0,0,1
2+
0,1,0,0,-1,0,1
3+
-1,0,0,1,0,0,1
4+
0,-1,0,0,1,0,1

data/arrays/example_array_6LS_3D.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
1 0 0 1
2+
-1 0 0 1
3+
0 1 0 1
4+
0 -1 0 1
5+
0 0 1 1
6+
0 0 -1 1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
1.8555,0.12942,1.6137,-1,0,0,0.1877
2+
1.8604,0.31567,1.6137,-1,0,0,0.2045
3+
1.8638,0.53832,1.6133,-1,0,0,0.22837
4+
1.8665,0.77237,1.6118,-1,0,0,0.24117
5+
1.8673,1.0206,1.6157,-1,0,0,0.24838
6+
1.8688,1.2691,1.6154,-1,0,0,0.23781
7+
1.8702,1.4962,1.6167,-1,0,0,0.20929
8+
1.8755,1.6876,1.6163,-1,0,0,0.22679
9+
1.6875,1.8702,1.6203,0,-1,0,0.22545
10+
1.4993,1.8843,1.6154,0,-1,0,0.21679
11+
1.2547,1.8749,1.6174,0,-1,0,0.23875
12+
1.022,1.8768,1.6184,0,-1,0,0.23992
13+
0.77488,1.8763,1.6175,0,-1,0,0.2349
14+
0.55221,1.8775,1.6177,0,-1,0,0.2327
15+
0.3095,1.8797,1.6157,0,-1,0,0.24573
16+
0.060789,1.882,1.6134,0,-1,0,0.21554
17+
-0.12151,1.8841,1.6101,0,-1,0,0.18685
18+
-0.31278,1.8791,1.613,0,-1,0,0.20506
19+
-0.53142,1.8855,1.6099,0,-1,0,0.22562
20+
-0.76382,1.8905,1.6061,0,-1,0,0.23945
21+
-1.0102,1.8888,1.6101,0,-1,0,0.25042
22+
-1.2646,1.8911,1.6086,0,-1,0,0.23947
23+
-1.4891,1.8936,1.607,0,-1,0,0.20807
24+
-1.6807,1.8964,1.6062,0,-1,0,0.22572
25+
-1.8625,1.7108,1.6075,1,0,0,0.22016
26+
-1.863,1.5303,1.6066,1,0,0,0.21877
27+
-1.8611,1.2733,1.6107,1,0,0,0.2448
28+
-1.8653,1.0408,1.6075,1,0,0,0.23885
29+
-1.8729,0.79578,1.6054,1,0,0,0.23437
30+
-1.8704,0.5722,1.6071,1,0,0,0.23219
31+
-1.881,0.33166,1.6053,1,0,0,0.24605
32+
-1.8783,0.080365,1.6075,1,0,0,0.21801
33+
-1.8781,-0.10434,1.6061,1,0,0,0.1852
34+
-1.8798,-0.28999,1.609,1,0,0,0.20278
35+
-1.8842,-0.50982,1.6095,1,0,0,0.22814
36+
-1.8911,-0.74608,1.6054,1,0,0,0.23945
37+
-1.8901,-0.98854,1.6102,1,0,0,0.24439
38+
-1.8928,-1.2348,1.6095,1,0,0,0.24209
39+
-1.8925,-1.4727,1.6117,1,0,0,0.21306
40+
-1.8939,-1.6609,1.6115,1,0,0,0.22209
41+
-1.7127,-1.8417,1.611,0,1,0,0.21959
42+
-1.5295,-1.8417,1.6129,0,1,0,0.21598
43+
-1.2809,-1.8485,1.6079,0,1,0,0.24212
44+
-1.0454,-1.8478,1.6094,0,1,0,0.2401
45+
-0.80072,-1.8512,1.609,0,1,0,0.23619
46+
-0.57305,-1.8524,1.6082,0,1,0,0.23437
47+
-0.33198,-1.8525,1.6074,0,1,0,0.24395
48+
-0.085164,-1.854,1.6085,0,1,0,0.21792
49+
0.10383,-1.8571,1.6082,0,1,0,0.18649
50+
0.28774,-1.8609,1.6061,0,1,0,0.20288
51+
0.50951,-1.8574,1.6049,0,1,0,0.22772
52+
0.74305,-1.8643,1.6034,0,1,0,0.23983
53+
0.989,-1.8695,1.6036,0,1,0,0.24802
54+
1.239,-1.8649,1.6041,0,1,0,0.24388
55+
1.4767,-1.8678,1.6054,0,1,0,0.20977
56+
1.6585,-1.8653,1.6059,0,1,0,0.22148
57+
1.8436,-1.6811,1.6054,-1,0,0,0.22264
58+
1.8563,-1.4974,1.6033,-1,0,0,0.21688
59+
1.8468,-1.248,1.6072,-1,0,0,0.24047
60+
1.85,-1.0167,1.6076,-1,0,0,0.23909
61+
1.8513,-0.76986,1.6101,-1,0,0,0.23739
62+
1.8585,-0.54207,1.6076,-1,0,0,0.23585
63+
1.8562,-0.29831,1.6107,-1,0,0,0.24122
64+
1.857,-0.059658,1.6121,-1,0,0,0.21387

doc/examples/sound_field_synthesis.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@
3131
# === get secondary source positions ===
3232
#array = sfs.array.linear(N, dx, center=[-1, 0, 0])
3333
#array = sfs.array.linear_random(N, 0.2*dx, 5*dx)
34-
array = sfs.array.rectangular(N, dx, orientation=sfs.util.direction_vector(0*np.pi/4))
35-
#array = sfs.array.circular(N, R)
36-
#array = sfs.array.load('../../data/arrays/university_rostock.csv')
34+
#array = sfs.array.rectangular(N, dx, orientation=sfs.util.direction_vector(0*np.pi/4))
35+
array = sfs.array.circular(N, R)
36+
#array = sfs.array.load('../../data/arrays/wfs_university_rostock_2018.csv')
37+
#array.x[:,2] = 0 # in wfs_university_rostock_2018.csv we encode absolute height
38+
# which is not used here, we also could set the grid coordinate to z=1.615 m
3739

3840
#array = sfs.array.planar(N, dx, orientation=sfs.util.direction_vector(np.radians(0), np.radians(180)))
3941
#array = sfs.array.cube(N, dx, orientation=sfs.util.direction_vector(0, np.pi/2))

0 commit comments

Comments
 (0)