simplify mie_cdf and fix notebook

scottprahl · May 7, 2024 · 43cefb5 · 43cefb5
1 parent bb60c9e
commit 43cefb5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 31 deletions.
diff --git a/docs/06_random_deviates.ipynb b/docs/06_random_deviates.ipynb
diff --git a/miepython/miepython.py b/miepython/miepython.py
@@ -622,17 +622,8 @@ def mie_cdf(m, x, num):
         cdf: array of cumulative distribution function values
     """
     mu = np.linspace(-1, 1, num)
-    s1, s2 = mie_S1_S2(m, x, mu, norm='one')
-
-    s = (np.abs(s1)**2 + np.abs(s2)**2) / 2
-
-    cdf = np.zeros(num)
-    total = 0
-    for i in range(num):
-        # need the extra 2pi because scattering normalized over 4π steradians
-        total += s[i] * (2 / num)
-        cdf[i] = total
-
+    intensity_per_mu = i_unpolarized(m, x, mu, norm='4pi') / num
+    cdf = np.cumsum(intensity_per_mu) 
     return mu, cdf
 
 

diff --git a/miepython/miepython_nojit.py b/miepython/miepython_nojit.py
@@ -539,17 +539,8 @@ def mie_cdf(m, x, num):
         cdf: array of cumulative distribution function values
     """
     mu = np.linspace(-1, 1, num)
-    s1, s2 = mie_S1_S2(m, x, mu, norm='one')
-
-    s = (np.abs(s1)**2 + np.abs(s2)**2) / 2
-
-    cdf = np.zeros(num)
-    total = 0
-    for i in range(num):
-        # need the extra 2pi because scattering normalized over 4π steradians
-        total += s[i] * 2 * np.pi * (2 / num)
-        cdf[i] = total
-
+    intensity_per_mu = i_unpolarized(m, x, mu, norm='4pi') / num
+    cdf = np.cumsum(intensity_per_mu) 
     return mu, cdf