Rename sfs.util.normal() -> sfs.util.direction_vector()

Author: mgeier

examples/horizontal_plane_arrays.py

@@ -17,12 +17,12 @@
 xnorm = [1, 1, 0]  # normalization point for plots
 grid = sfs.util.xyz_grid([-2.5, 2.5], [-1.5, 2.5], 0, spacing=0.02)
 acenter = [0.3, 0.7, 0]  # center and normal vector of array
-anormal = sfs.util.normal(np.radians(35), np.radians(90))
+anormal = sfs.util.direction_vector(np.radians(35), np.radians(90))
 
 # angular frequency
 omega = 2 * np.pi * f
 # normal vector of plane wave
-npw = sfs.util.normal(np.radians(pw_angle), np.radians(90))
+npw = sfs.util.direction_vector(np.radians(pw_angle), np.radians(90))
 
 
 def compute_and_plot_soundfield(title):

examples/sound_field_synthesis.py

@@ -25,19 +25,19 @@
 # angular frequency
 omega = 2 * np.pi * f
 # normal vector of plane wave
-npw = sfs.util.normal(np.radians(pw_angle), np.radians(90))
+npw = sfs.util.direction_vector(np.radians(pw_angle), np.radians(90))
 
 
 # === get secondary source positions ===
 #x0, n0, a0 = sfs.array.linear(N, dx, center=[-1, 0, 0])
 #x0, n0, a0 = sfs.array.linear_nested(N, dx, 2*dx)
 #x0, n0, a0 = sfs.array.linear_random(N, 0.2*dx, 5*dx)
-#x0, n0, a0 = sfs.array.rectangular(N, dx, N, dx, n0=sfs.util.normal(0*np.pi/4, np.pi/2))
+#x0, n0, a0 = sfs.array.rectangular(N, dx, N, dx, n0=sfs.util.direction_vector(0*np.pi/4, np.pi/2))
 #x0, n0, a0 = sfs.array.circular(N, R)
 x0, n0, a0 = sfs.array.load('../data/arrays/university_rostock.csv')
 
-#x0, n0, a0 = sfs.array.planar(N, dx, N, dx, n0=sfs.util.normal(np.radians(0),np.radians(180)))
-#x0, n0, a0 = sfs.array.cube(N, dx, N, dx, N, dx, n0=sfs.util.normal(0, np.pi/2))
+#x0, n0, a0 = sfs.array.planar(N, dx, N, dx, n0=sfs.util.direction_vector(np.radians(0),np.radians(180)))
+#x0, n0, a0 = sfs.array.cube(N, dx, N, dx, N, dx, n0=sfs.util.direction_vector(0, np.pi/2))
 
 #x0, n0, a0 = sfs.array.sphere_load('/Users/spors/Documents/src/SFS/data/spherical_grids/equally_spaced_points/006561points.mat', 1, center=[.5,0,0])
 

examples/soundfigures.py

@@ -22,7 +22,7 @@
 omega = 2 * np.pi * f
 
 # normal vector of plane wave
-npw = sfs.util.normal(np.radians(pw_angle[0]), np.radians(pw_angle[1]))
+npw = sfs.util.direction_vector(np.radians(pw_angle[0]), np.radians(pw_angle[1]))
 
 # spatial grid
 x = sfs.util.strict_arange(-3, 3, 0.02, endpoint=True)

sfs/mono/source.py

@@ -204,7 +204,7 @@ def plane(omega, x0, n0, grid, c=None):
         :context: close-figs
 
         direction = 45  # degree
-        n0 = sfs.util.normal(np.radians(direction), np.radians(90))
+        n0 = sfs.util.direction_vector(np.radians(direction))
         p_plane = sfs.mono.source.plane(omega, x0, n0, grid)
         sfs.plot.soundfield(p_plane, grid);
         plt.title("Plane wave with direction {} degree".format(direction))

sfs/util.py

@@ -36,10 +36,9 @@ def wavenumber(omega, c=None):
     return omega / c
 
 
-def normal(alpha, beta):
+def direction_vector(alpha, beta=np.pi/2):
     """Compute normal vector from azimuth, colatitude."""
-    return [np.cos(alpha) * np.sin(beta), np.sin(alpha) * np.sin(beta),
-            np.cos(beta)]
+    return sph2cart(alpha, beta, 1)
 
 
 def sph2cart(alpha, beta, r):