Fixed error for scalar angles in angular.sht_matrix

Author: spors

examples/modal_beamforming_rigid_array.py

@@ -8,7 +8,7 @@
 import micarray
 
 N = 20  # order of modal beamformer/microphone array
-azi_pw = np.array([np.pi])  # incidence angle of plane wave
+azi_pw = np.pi  # incidence angle of plane wave
 azi_pwd = np.linspace(0, 2*np.pi, 91, endpoint=False)  # angles for plane wave decomposition
 kr = np.linspace(0.1, 20, 100)  # wavenumber-radius vector
 

micarray/modal/angular.py

@@ -1,10 +1,13 @@
 from __future__ import division
 import numpy as np
 from scipy import special
+from .. import util
 
 
 def sht_matrix(N, azi, elev, weights=None):
     """ (N+1)**2 x M SHT matrix"""
+    azi = util.asarray_1d(azi)
+    elev = util.asarray_1d(elev)
     if azi.ndim == 0:
         M = 1
     else:

micarray/util.py

@@ -17,3 +17,20 @@ def coherence_of_columns(A):
     for j in range(N):
         Gram_A[j, j] = 0
     return np.max(np.abs(Gram_A))
+
+
+def asarray_1d(a, **kwargs):
+    """Squeeze the input and check if the result is one-dimensional.
+
+    Returns *a* converted to a `numpy.ndarray` and stripped of
+    all singleton dimensions.  Scalars are "upgraded" to 1D arrays.
+    The result must have exactly one dimension.
+    If not, an error is raised.
+
+    """
+    result = np.squeeze(np.asarray(a, **kwargs))
+    if result.ndim == 0:
+        result = result.reshape((1,))
+    elif result.ndim > 1:
+        raise ValueError("array must be one-dimensional")
+    return result