fix rename to integration_order

examples/dipole_forces.py

@@ -293,7 +293,7 @@ def dipole_force(alpha, z_pos, dim, numpoints):
     small_bead,
     bfp_sampling_n=bfp_sampling_n,
     num_orders=None,
-    integration_orders=None,
+    integration_order=None,
 )
 
 Fz_mie = force_function(bead_center=[(0, 0, zz) for zz in z])[:, 2]
@@ -405,7 +405,7 @@ def dipole_force(alpha, z_pos, dim, numpoints):
     medium_bead,
     bfp_sampling_n=bfp_sampling_n,
     num_orders=None,
-    integration_orders=None,
+    integration_order=None,
 )
 Fz_mie = force_function(bead_center=[(0, 0, zz) for zz in z])[:, 2]
 

examples/trapping_forces.py

@@ -161,7 +161,7 @@ def gaussian_beam(_, x_bfp, y_bfp, *args):
 # %% [markdown]
 # ## Convergence
 # ### To check accuracy:
-# 1. Increase the number of integration orders `integration_orders` and check the difference between the old and newly calculated forces
+# 1. Increase the order of the integration `integration_order` and check the difference between the old and newly calculated forces
 # 1. Increase the number of samples at the back focal plane `bfp_sampling_n` and check the difference between the old and newly calculated forces
 # 1. Increase the number of Mie scattering orders and check the difference between the old and newly calculated forces
 
@@ -173,7 +173,7 @@ def gaussian_beam(_, x_bfp, y_bfp, *args):
     bfp_sampling_n=bfp_sampling_n,
     bead_center=[(0, 0, zz) for zz in z],
     num_orders=None,
-    integration_orders=None,
+    integration_order=None,
 )[:, 2]
 Fz2 = trp.forces_focus(
     gaussian_beam,
@@ -182,7 +182,7 @@ def gaussian_beam(_, x_bfp, y_bfp, *args):
     bfp_sampling_n=bfp_sampling_n * 2,
     bead_center=[(0, 0, zz) for zz in z],
     num_orders=None,
-    integration_orders=None,
+    integration_order=None,
 )[:, 2]
 
 # %%

src/lumicks/pyoptics/trapping/interface.py

@@ -514,7 +514,7 @@ def force_factory(
             # Find nearest integration order that is equal or greater than the user's
             integration_order = get_nearest_order(integration_order)
     else:
-        integration_order = determine_integration_order(integration_order, method, n_orders)
+        integration_order = determine_integration_order(method, n_orders)
     x, y, z, w = get_integration_locations(integration_order, method)
     xb, yb, zb = [c * bead.bead_diameter * 0.51 for c in (x, y, z)]
 
@@ -720,11 +720,8 @@ def absorbed_power_focus(
             # Find nearest integration order that is equal or greater than the user's
             integration_order = get_nearest_order(integration_order)
     else:
-        integration_order = determine_integration_order(integration_order, method, n_orders)
-
-    # Enforce floats to ensure Numba has all floats when doing @ / np.matmul
-    x, y, z, w = [np.asarray(coord).astype(np.float64) for coord in (x, y, z, w)]
-
+        integration_order = determine_integration_order(method, n_orders)
+    x, y, z, w = get_integration_locations(integration_order, method)
     xb, yb, zb = [
         ax * bead.bead_diameter * 0.51 + bead_center[idx] for idx, ax in enumerate((x, y, z))
     ]
@@ -824,7 +821,7 @@ def scattered_power_focus(
             # Find nearest integration order that is equal or greater than the user's
             integration_order = get_nearest_order(integration_order)
     else:
-        integration_order = determine_integration_order(integration_order, method, n_orders)
+        integration_order = determine_integration_order(method, n_orders)
 
     x, y, z, w = get_integration_locations(integration_order, method)
 

tests/trapping/test_force_focus_dipole.py

@@ -125,7 +125,7 @@ def test_force_focus(z_pos):
         bead=bead,
         bfp_sampling_n=bfp_sampling_n,
         num_orders=None,
-        integration_orders=None,
+        integration_order=None,
     )
     for p in range(numpoints):
         for m in range(numpoints):
@@ -149,7 +149,7 @@ def test_force_focus(z_pos):
         bead_center=bead_positions,
         bfp_sampling_n=bfp_sampling_n,
         num_orders=None,
-        integration_orders=None,
+        integration_order=None,
     )
     Fx_mie, Fy_mie, Fz_mie = [F[:, idx].reshape(numpoints, numpoints) for idx in range(3)]
     [

tests/trapping/test_scattering_absorption.py

@@ -97,7 +97,6 @@ def input_field_Ephi(_, x_bfp, *args):
                 bead=bead,
                 bead_center=(0, 0, 0),
                 bfp_sampling_n=bfp_sampling_n,
-                verbose=False,
                 num_orders=num_orders,
             )
 
@@ -107,7 +106,6 @@ def input_field_Ephi(_, x_bfp, *args):
                 bead=bead,
                 bead_center=(0, 0, 0),
                 bfp_sampling_n=bfp_sampling_n,
-                verbose=False,
                 num_orders=num_orders,
             )
 
@@ -122,7 +120,6 @@ def input_field_Ephi(_, x_bfp, *args):
                 bead=bead,
                 bead_center=(0, 0, 0),
                 bfp_sampling_n=bfp_sampling_n,
-                verbose=False,
                 num_orders=num_orders,
             )
 
@@ -132,7 +129,6 @@ def input_field_Ephi(_, x_bfp, *args):
                 bead=bead,
                 bead_center=(0, 0, 0),
                 bfp_sampling_n=bfp_sampling_n,
-                verbose=False,
                 num_orders=num_orders,
             )