removed option to specify kd as Quantity; must now be float/complex

Author: vnmanoharan

pymie/mie.py

@@ -321,10 +321,10 @@ def calc_dwell_time(radius, n_medium, n_particle, wavelen,
         angles = Quantity(np.linspace(min_angle, np.pi, num_angles), 'rad')
         distance = radius.max()
         k = 2*np.pi/wavelen_media
+        kd = (k*distance).to("").magnitude
         (diff_cscat_par,
-         diff_cscat_perp) = diff_scat_intensity_complex_medium(m,
-                                        x, angles,
-                                        k*distance)
+         diff_cscat_perp) = diff_scat_intensity_complex_medium(m, x, angles,
+                                                               kd)
 
         cscat = integrate_intensity_complex_medium(diff_cscat_par,
                                                    diff_cscat_perp,
@@ -360,8 +360,9 @@ def calc_reflectance(radius, n_medium, n_particle, wavelen,
     if np.any(np.imag(x) > 0):
         distance = rmax
         k = np.atleast_1d(2*np.pi/wavelen_media)
+        kd = (k*distance).to("").magnitude
         diff_cscat = diff_scat_intensity_complex_medium(m, x, thetas,
-                                                        k*distance)
+                                                        kd)
         refl_cscat = integrate_intensity_complex_medium(diff_cscat,
                                                         distance, thetas, k)[0]
     else:
@@ -963,10 +964,6 @@ def _scat_fields_complex_medium(m, x, thetas, kd, near_field=False):
     Q. Fu and W. Sun, "Mie theory for light scattering by a spherical particle
     in an absorbing medium". Applied Optics, 40, 9 (2001).
     '''
-    # convert units from whatever units the user specifies
-    if isinstance(kd, Quantity):
-        kd = kd.to('').magnitude
-
     # calculate mie coefficients
     nstop = _nstop(np.array(x).max())
     n = np.arange(nstop)+1.
@@ -1177,9 +1174,6 @@ def diff_scat_intensity_complex_medium(m, x, thetas, kd, phis=None,
     in an absorbing medium". Applied Optics, 40, 9 (2001).
 
     """
-    if isinstance(kd, Quantity):
-        kd = kd.to('').magnitude
-
     # ensure that broadcasting will work correctly
     kd = np.atleast_1d(kd)[:, np.newaxis]
     if cartesian:
@@ -1438,10 +1432,6 @@ def diff_abs_intensity_complex_medium(m, x, thetas, ktd):
     in an absorbing medium". Applied Optics, 40, 9 (2001).
 
     '''
-    # convert units from whatever units the user specifies
-    if isinstance(ktd, Quantity):
-        ktd = ktd.to('').magnitude
-
     # calculate mie coefficients
     nstop = _nstop(np.array(x).max())
     n = np.arange(nstop)+1.

pymie/tests/test_mie.py

@@ -520,7 +520,7 @@ def test_cross_section_complex_medium():
                                                      n_matrix, x_scat, x,
                                                      wavelen)[0]
     # With Mie solutions in absorbing medium
-    rho_scat = k*distance
+    rho_scat = (k*distance).to("").magnitude
     I_parperp = mie.diff_scat_intensity_complex_medium(m, x, theta, rho_scat)
     cscat_exact = mie.integrate_intensity_complex_medium(I_parperp,
                                                          distance, theta, k)[0]
@@ -562,7 +562,7 @@ def test_cross_section_complex_medium():
                                                       n_matrix, x_scat, x,
                                                       wavelen)[0]
     # With full Mie solutions that include the near fields
-    rho_scat = k*distance
+    rho_scat = (k*distance).to("").magnitude
     I_parperp = mie.diff_scat_intensity_complex_medium(m, x, theta, rho_scat,
                                                        near_field=True)
     cscat_exact2 = mie.integrate_intensity_complex_medium(I_parperp,
@@ -577,7 +577,7 @@ def test_cross_section_complex_medium():
     m = index_ratio(n_particle, n_matrix)
     k = 2*np.pi*n_matrix/wavelen
     x = size_parameter(wavelen, n_matrix, radius)
-    rho_scat = k*distance
+    rho_scat = (k*distance).to("").magnitude
 
     # With full Mie solutions
     I_parperp = mie.diff_scat_intensity_complex_medium(m, x, theta, rho_scat)
@@ -608,7 +608,7 @@ def test_multilayer_complex_medium():
     angles = np.linspace(0, np.pi, 10000)
     distance = Quantity(100000000.0,'nm')
     k =  2*np.pi*n_sample/wavelen
-    kd = k*distance
+    kd = (k*distance).to("").magnitude
 
     # With far-field Mie solutions
     cscat_real = mie.calc_cross_sections(marray, xarray, wavelen/n_sample)[0]
@@ -697,7 +697,7 @@ def test_diff_scat_intensity_complex_medium_cartesian():
     # parameters for calculating scattering
     m = index_ratio(n_particle, n_matrix)
     x = size_parameter(wavelen, n_matrix, radius)
-    kd = 2*np.pi*n_matrix/wavelen*Quantity(10000.0,'nm')
+    kd = (2*np.pi*n_matrix/wavelen*Quantity(10000.0,'nm')).to("").magnitude
 
     # calculate differential scattered intensity in par/perp basis
     I_parperp = mie.diff_scat_intensity_complex_medium(m, x, thetas_2d, kd,
@@ -736,7 +736,7 @@ def test_integrate_intensity_complex_medium_cartesian():
     x = size_parameter(wavelen, n_matrix, radius)
     k = 2*np.pi*n_matrix/wavelen
     distance = Quantity(10000.0,'nm')
-    kd = k*distance
+    kd = (k*distance).to("").magnitude
 
     # calculate the differential scattered intensities
     I_xy = mie.diff_scat_intensity_complex_medium(m, x, thetas_2d, kd,
@@ -781,7 +781,7 @@ def test_value_errors():
     x = size_parameter(wavelen, n_matrix, radius)
     k = 2*np.pi*n_matrix/wavelen
     distance = Quantity(10000.0,'nm')
-    kd = k*distance
+    kd = (k*distance).to("").magnitude
 
     with pytest.raises(ValueError):
         # try to calculate near field in cartesian

pymie/tests/test_mie_vectorized.py

@@ -617,7 +617,7 @@ def test_vectorized_angular_functions(self, num_wavelen,
         # scattering calculations
         k = 2*np.pi*n_matrix/wavelen
         d = 10*np.atleast_1d(radius)[-1]
-        kd = np.atleast_1d(k*d)
+        kd = np.atleast_1d(k*d).to("").magnitude
         i12 = mie.diff_scat_intensity_complex_medium(m, x, thetas,
                                                      kd,
                                                      cartesian=cartesian,