PyMieSim 3.5.4.1__cp310-cp310-macosx_14_0_arm64.whl → 3.5.4.3__cp310-cp310-macosx_14_0_arm64.whl

PyMieSim/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.5.4.1'
-__version_tuple__ = version_tuple = (3, 5, 4, 1)
+__version__ = version = '3.5.4.3'
+__version_tuple__ = version_tuple = (3, 5, 4, 3)

PyMieSim/experiment/scatterer/base.py

@@ -62,11 +62,17 @@ class BaseScatterer():
         CPPClass = CppMediumProperties if name == 'medium' else CppScattererProperties
 
         if all(isinstance(item, Quantity) for item in properties):
-            self.binding_kwargs[f'{name}_properties'] = CPPClass(index_properties=properties.magnitude)
+            instance = CPPClass(index_properties=properties.magnitude)
+            self.binding_kwargs[f'{name}_properties'] = instance
+
+            return instance
 
         elif all(isinstance(item, BaseMaterial) for item in properties):
             eval_index = numpy.asarray([m.compute_refractive_index(self.source.wavelength.to_base_units().magnitude) for m in properties])
-            self.binding_kwargs[f'{name}_properties'] = CPPClass(material_properties=eval_index)
+            instance = CPPClass(material_properties=eval_index)
+            self.binding_kwargs[f'{name}_properties'] = instance
+
+            return instance
 
         else:
             raise TypeError("All elements in the list must be of type 'Quantity' or 'BaseMaterial', not a mix of both.")

PyMieSim/experiment/scatterer/core_shell.py

@@ -66,14 +66,17 @@ class CoreShell(BaseScatterer, Sequential):
             is_sequential=self.is_sequential
         )
 
-        self._add_properties(name='medium', properties=self.medium_property)
+        mediun_properties = self._add_properties(name='medium', properties=self.medium_property)
 
-        self._add_properties(name='core', properties=self.core_property)
+        core_properties = self._add_properties(name='core', properties=self.core_property)
 
-        self._add_properties(name='shell', properties=self.shell_property)
+        shell_properties = self._add_properties(name='shell', properties=self.shell_property)
 
-        binding_kwargs = {
-            k: v.to_base_units().magnitude if isinstance(v, Quantity) else v for k, v in self.binding_kwargs.items()
-        }
-
-        self.binding = CppCoreShellSet(**binding_kwargs)
+        self.binding = CppCoreShellSet(
+            core_diameter=self.core_diameter.to('meter').magnitude,
+            shell_thickness=self.shell_thickness.to('meter').magnitude,
+            core_properties=core_properties,
+            shell_properties=shell_properties,
+            medium_properties=mediun_properties,
+            is_sequential=self.is_sequential,
+        )

PyMieSim/experiment/scatterer/cylinder.py

@@ -51,12 +51,13 @@ class Cylinder(BaseScatterer, Sequential):
 
         self.binding_kwargs = dict(diameter=self.diameter, is_sequential=self.is_sequential)
 
-        self._add_properties(name='medium', properties=self.medium_property)
+        mediun_properties = self._add_properties(name='medium', properties=self.medium_property)
 
-        self._add_properties(name='scatterer', properties=self.property)
+        scatterer_properties = self._add_properties(name='scatterer', properties=self.property)
 
-        binding_kwargs = {
-            k: v.to_base_units().magnitude if isinstance(v, Quantity) else v for k, v in self.binding_kwargs.items()
-        }
-
-        self.binding = CppCylinderSet(**binding_kwargs)
+        self.binding = CppCylinderSet(
+            diameter=self.diameter.to('meter').magnitude,
+            scatterer_properties=scatterer_properties,
+            medium_properties=mediun_properties,
+            is_sequential=self.is_sequential,
+        )

PyMieSim/experiment/scatterer/sphere.py

@@ -54,12 +54,13 @@ class Sphere(BaseScatterer, Sequential):
 
         self.binding_kwargs = dict(diameter=self.diameter, is_sequential=self.is_sequential)
 
-        self._add_properties(name='medium', properties=self.medium_property)
+        mediun_properties = self._add_properties(name='medium', properties=self.medium_property)
 
-        self._add_properties(name='scatterer', properties=self.property)
+        scatterer_properties = self._add_properties(name='scatterer', properties=self.property)
 
-        binding_kwargs = {
-            k: v.to_base_units().magnitude if isinstance(v, Quantity) else v for k, v in self.binding_kwargs.items()
-        }
-
-        self.binding = CppSphereSet(**binding_kwargs)
+        self.binding = CppSphereSet(
+            diameter=self.diameter.to('meter').magnitude,
+            scatterer_properties=scatterer_properties,
+            medium_properties=mediun_properties,
+            is_sequential=self.is_sequential,
+        )

PyMieSim/experiment/source/gaussian.py

@@ -32,12 +32,17 @@ class Gaussian(BaseSource, Sequential):
     wavelength: Quantity
     polarization: Union[BasePolarization, Quantity]
 
-    def _generate_binding_kwargs(self) -> None:
+    def _generate_binding(self) -> None:
         """
         Prepares the keyword arguments for the C++ binding based on the scatterer's properties. This
         involves evaluating material indices and organizing them into a dictionary for the C++ interface.
 
         """
+        self.mapping = {}
+
+        if not isinstance(self.polarization, BasePolarization):
+            self.polarization = Linear(self.polarization)
+
         self.binding_kwargs = dict(
             wavelength=self.wavelength,
             jones_vector=self.polarization.element,
@@ -46,16 +51,10 @@ class Gaussian(BaseSource, Sequential):
             is_sequential=self.is_sequential
         )
 
-    def _generate_binding(self):
-        self.mapping = {}
-
-        if not isinstance(self.polarization, BasePolarization):
-            self.polarization = Linear(self.polarization)
-
-        self._generate_binding_kwargs()
-
-        binding_kwargs = {
-            k: v.to_base_units().magnitude if isinstance(v, Quantity) else v for k, v in self.binding_kwargs.items()
-        }
-
-        self.binding = CppGaussianSourceSet(**binding_kwargs)
+        self.binding = CppGaussianSourceSet(
+            wavelength=self.wavelength.to('meter').magnitude,
+            jones_vector=self.polarization.element,
+            NA=self.NA.to('dimensionless').magnitude,
+            optical_power=self.optical_power.to('watt').magnitude,
+            is_sequential=self.is_sequential
+        )

PyMieSim/experiment/source/planewave.py

@@ -40,14 +40,20 @@ class PlaneWave(BaseSource, Sequential):
 
         return value
 
-    def _generate_binding_kwargs(self) -> None:
+    def _generate_binding(self) -> None:
         """
         Prepares the keyword arguments for the C++ binding based on the scatterer's properties. This
         involves evaluating material indices and organizing them into a dictionary for the C++ interface.
 
-        Returns:
-            None
+        Returns
+        -------
+        None
         """
+        self.mapping = {}
+
+        if not isinstance(self.polarization, BasePolarization):
+            self.polarization = Linear(self.polarization)
+
         self.binding_kwargs = dict(
             wavelength=self.wavelength,
             jones_vector=self.polarization.element,
@@ -55,16 +61,9 @@ class PlaneWave(BaseSource, Sequential):
             is_sequential=self.is_sequential
         )
 
-    def _generate_binding(self):
-        self.mapping = {}
-
-        if not isinstance(self.polarization, BasePolarization):
-            self.polarization = Linear(self.polarization)
-
-        self._generate_binding_kwargs()
-
-        binding_kwargs = {
-            k: v.to_base_units().magnitude if isinstance(v, Quantity) else v for k, v in self.binding_kwargs.items()
-        }
-
-        self.binding = CppPlaneWaveSourceSet(**binding_kwargs)
+        self.binding = CppPlaneWaveSourceSet(
+            wavelength=self.wavelength.to('meter').magnitude,
+            jones_vector=self.polarization.element,
+            amplitude=self.amplitude.to('volt/meter').magnitude,
+            is_sequential=self.is_sequential
+        )

{pymiesim-3.5.4.1.dist-info → pymiesim-3.5.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyMieSim
-Version: 3.5.4.1
+Version: 3.5.4.3
 Summary: A package for light scattering computation.
 Keywords: mie,scattering,backscatter,sphere,cylinder,nanoparticle,phase function,efficiency,rayleigh,backscattering
 Author-Email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
@@ -61,7 +61,7 @@ Provides-Extra: testing
 Requires-Dist: pytest>=0.6; extra == "testing"
 Requires-Dist: pytest-cov>=2.0; extra == "testing"
 Requires-Dist: pytest-json-report==1.5.0; extra == "testing"
-Requires-Dist: coverage==7.8.2; extra == "testing"
+Requires-Dist: coverage==7.9.1; extra == "testing"
 Provides-Extra: documentation
 Requires-Dist: numpydoc==1.8.0; extra == "documentation"
 Requires-Dist: sphinx>=5.1.1; extra == "documentation"

{pymiesim-3.5.4.1.dist-info → pymiesim-3.5.4.3.dist-info}/RECORD

@@ -1,5 +1,9 @@
+pymiesim-3.5.4.3.dist-info/RECORD,,
+pymiesim-3.5.4.3.dist-info/WHEEL,sha256=XNlkiEK0Q3WpNUax7PCCZPGBloeUiy1DCgD8emtk080,114
+pymiesim-3.5.4.3.dist-info/METADATA,sha256=3QF4Pz6lqkM-onxvKsHs4zMk7yLajZ-4mZx9uSpp8dM,13472
+pymiesim-3.5.4.3.dist-info/licenses/LICENSE,sha256=-QSWDJghhVqbAzChmEK86liqPX_eeQFgdwlrKTLLcIA,1088
 PyMieSim/units.py,sha256=L7Trn8rW5d5AQK1_8I-XwaHGswXklupXs5wHgWQtJNQ,4224
-PyMieSim/_version.py,sha256=5Tapzkw5U6lFgs0XMplhd1DKg_j63IGqiiYAseYMB5I,516
+PyMieSim/_version.py,sha256=l0lRbKiwIHWmY6kRcxAgchNaIBGY3lnaM0_Hpo0-dOI,516
 PyMieSim/directories.py,sha256=ohe9qvjwN0IJ7OpZHsD7LxKYGMLr4CC7xYUGgWgw-Rg,648
 PyMieSim/__init__.py,sha256=BGzl1hTX7-KoanQDm26IRHq6AmPFzVoIFcvOMfI0wQQ,249
 PyMieSim/mesh.py,sha256=WcX_rXpWxH7WDniIqaG4rPC-pfDm4AG9ZAX-zI8GbhU,14566
@@ -54,38 +58,34 @@ PyMieSim/experiment/setup.py,sha256=_dt2urIwClCKiKWJjgF4kNOB98gTj1XLNMSPf3KGYOU,
 PyMieSim/experiment/utils.py,sha256=H4KkYMN33NSm9nwman0vk-umW9ecMsPKujQ4zkctMzc,5380
 PyMieSim/experiment/dataframe_subclass.py,sha256=qPD_XW8x4WApQFdNOHJHt-Mc3BoT1b9y28dWmpZxccU,7174
 PyMieSim/experiment/source/__init__.py,sha256=tAfSmMqMTem6-obvbOHD2YK7l4UDh1g-20t789_1Ihw,64
-PyMieSim/experiment/source/planewave.py,sha256=lxUKI2NNV5WXEWRu0CTu-TK15juU4UovWsMTPyIMhv8,2488
+PyMieSim/experiment/source/planewave.py,sha256=62RHOHCuTj0LrZ_0IAmLSiVyYyPRvRnLfBQIbdI0gwo,2480
 PyMieSim/experiment/source/base.py,sha256=QDe7CTQVQthI0KDmvLET4-5kxbv7ESuplmiU2Ubn1LM,3104
-PyMieSim/experiment/source/gaussian.py,sha256=hgtzhWQ41TNYNZyRv8kxIJ8YinGVHMXhN8qsQ71NoFo,2294
+PyMieSim/experiment/source/gaussian.py,sha256=DRkap4C9vHHV85yE6Cj2qM3MsoZbNdX_wSilBRParE4,2331
 PyMieSim/experiment/scatterer/__init__.py,sha256=_19R38S6LSGuuFRRPTFK1Lv2jaSoFk6O1V7CdwdhLXo,124
-PyMieSim/experiment/scatterer/core_shell.py,sha256=SAlSDlaLqs7DpYMafv74BNIOHXyegJgchmlTvHHtiL4,3248
-PyMieSim/experiment/scatterer/base.py,sha256=sTbaoI0VKY8pbrbxns8p45iQJvqDRtQ5UFkvpd2X7yA,3757
-PyMieSim/experiment/scatterer/sphere.py,sha256=yapEd4t7iIZtEqkhA4EYANNYavw6skcv3wlwgltkpoI,2756
-PyMieSim/experiment/scatterer/cylinder.py,sha256=Ly4PvDME7W2cOdXO2rdgquCSxgjjkKNgma6FkkB9HkA,2449
+PyMieSim/experiment/scatterer/core_shell.py,sha256=4VbxS6Evcz5sjNlB3wtMTdScXCPLHov87Vr3HNlH-AQ,3470
+PyMieSim/experiment/scatterer/base.py,sha256=3hesoH2tNh2JtyOSSefU7Jl1WWjVpf8-QFmM1IfaR6Q,3879
+PyMieSim/experiment/scatterer/sphere.py,sha256=tPZMCfrGlttVh6W2kJSLxzz1zvKEQNC7CmVk5yIaBSM,2845
+PyMieSim/experiment/scatterer/cylinder.py,sha256=yr8fJsX-tj5HaCqxQOd4UccUxvWylZRgHXhXTL4tflE,2538
 PyMieSim/experiment/detector/photodiode.py,sha256=GBSoF3mhVRyADJbEO2g4n0LffmGU7HOc5gDGF-ojgLQ,1850
 PyMieSim/experiment/detector/coherent_mode.py,sha256=ME1CtxUfPY40E3HJoqJrW0ikje6QvhMY4RYs-yOvx0Q,1805
 PyMieSim/experiment/detector/__init__.py,sha256=pvtXHKR2pM7JOeTTcouKipeQwi0e8dZiZTpdAn9K2Ls,75
 PyMieSim/experiment/detector/base.py,sha256=j2yY_InLQDAPgDkM19ILlIEF-2koGMKRe9Hc-nFpyGc,7340
-PyMieSim/binary/libcpp_cylinder.a,sha256=_Vfa748gUA5iqNRMrBW7tsIiX7ojUMS7cm9ZDZZs37w,161368
-PyMieSim/binary/libcpp_coordinates.a,sha256=LKLxUTMHpff96Z2ugcAvUtSY9ZcbyoVHk3KyDH4OcAE,22432
-PyMieSim/binary/libcpp_source.a,sha256=vg6gYNzXyVFTOJq0CEKHRVTLpoql11omByYP9X62lhk,6720
+PyMieSim/binary/libcpp_coordinates.a,sha256=-D1IStWtebqdrOgFgSqhkA2uyzMtq8Pa9LfOypCmDKQ,22432
+PyMieSim/binary/libcpp_source.a,sha256=VRpJNntSNWb5Knh9OH12iTzc8QHGviLXuxOCltZ6C-Y,6720
 PyMieSim/binary/interface_experiment.cpython-310-darwin.so,sha256=UCgdLZHrbVmEZ432PUrIHE8P8lAlM_IDyx0hEZqd3nU,456752
-PyMieSim/binary/libcpp_sphere.a,sha256=lSlwmWWkJ7DxrH0jykiPzZBDpXS2PHRVRAvs2H80HYc,171760
 PyMieSim/binary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PyMieSim/binary/interface_source.cpython-310-darwin.so,sha256=rpdCj8Y6nvkHYAgsvGPdpXw6Tuc5QJrEko0qyPz80hc,223664
-PyMieSim/binary/libcpp_fibonacci.a,sha256=K48h1Ts9bOYK2HM1gwHlnMZL_D79zWyVQ9JX8teNLHk,14160
-PyMieSim/binary/libZBessel.a,sha256=hXIGaBqJvxC0fV6rssEePbuJB9VDn6tIqm9fM_1hodw,106200
-PyMieSim/binary/interface_sets.cpython-310-darwin.so,sha256=mOuQ-k55bFh1pg15iLQSAp-C3Qiqh4cCyU1OiOYSqts,544672
-PyMieSim/binary/libcpp_experiment.a,sha256=Xf3ritmI6z6TwV1viSdNKsjtAt6yoAz3_lNHwFjTaB8,148872
-PyMieSim/binary/lib_ZBessel.a,sha256=i0v_cj07QclBw98KXqNVQCdyYj8yJxjpcAzZnLXR-uI,9840
-PyMieSim/binary/libcpp_coreshell.a,sha256=ZP4UWXTFKrmWI7oETY6-wn6IgP8NZq03pzFDGc3RiME,171064
-PyMieSim/binary/libcpp_mode_field.a,sha256=HkJccbRC25B4GJnzNjJODhJvgw45zHbiO-TZnrrxRs0,10960
-PyMieSim/binary/interface_scatterer.cpython-310-darwin.so,sha256=H-R0X3GCRQP6pJ8IRb9z2I8bj7ClPwg67fU-Vz4QH_0,541440
-PyMieSim/binary/interface_detector.cpython-310-darwin.so,sha256=GX9-2miDwhgx9MVT3swRE8355ma91HLuApi8skh96tc,457136
-PyMieSim/binary/libcpp_base_scatterer.a,sha256=T7hbGO_OtfkfrvQkL5wV3I3cq7jrD7x6lVogtnNNqA8,172320
-PyMieSim/binary/libcpp_sets.a,sha256=keEjDLV8EPNAWTXhWlGgP6tWLkO56R-fHikAGbd4Ttc,148864
-PyMieSim/binary/libcpp_detector.a,sha256=x_3ZMKbc3Uo-7E5KEaJVYbTeEakIUDBj0dGmwqrhDRI,176408
-pymiesim-3.5.4.1.dist-info/RECORD,,
-pymiesim-3.5.4.1.dist-info/WHEEL,sha256=XNlkiEK0Q3WpNUax7PCCZPGBloeUiy1DCgD8emtk080,114
-pymiesim-3.5.4.1.dist-info/METADATA,sha256=lF-Jv_Pr0ijVs5CZmGwC_LF4dH68v33pIcICD6h1zMo,13472
-pymiesim-3.5.4.1.dist-info/licenses/LICENSE,sha256=-QSWDJghhVqbAzChmEK86liqPX_eeQFgdwlrKTLLcIA,1088
+PyMieSim/binary/libcpp_fibonacci.a,sha256=FFpFyNmXsojSpK_MKn3VK0teL5iYs6yl4uXaJHuhDaQ,14160
+PyMieSim/binary/interface_sets.cpython-310-darwin.so,sha256=BNlKN6BC7ORNSA8BugkD3RGHQHToa79lKOmbTrhoGhQ,544672
+PyMieSim/binary/libcpp_experiment.a,sha256=DcqbTxQdolmK_2xWUJsXV6dZ-mHlZKm4WvAOH9vEkd0,148872
+PyMieSim/binary/libcpp_mode_field.a,sha256=FQI2E_hpaLUz6SCnormpAnyG0gmEeaUvUrZa2NCHl1U,10960
+PyMieSim/binary/interface_scatterer.cpython-310-darwin.so,sha256=RuIFRUL5za0Gs1m53KQgaY7_cC2qQCtXtMhVdPpYRlw,541440
+PyMieSim/binary/interface_detector.cpython-310-darwin.so,sha256=1hHF3ya14-4IYVqsRt0IYMmGw4EHumGgG0bbDr_wE4s,440576
+PyMieSim/binary/libcpp_sets.a,sha256=R9wgf-0GtCs2d7qUS8Y2BqbancwYszDRySBvlIDAbrA,148864
+PyMieSim/binary/libcpp_detector.a,sha256=yFm80m1ejt_9LvYNeMws_Sxx24VmJ2kzNwrbBhQiMdo,176408
+lib/libcpp_cylinder.a,sha256=PyZdSpBngjxQTknzewEwhuDDxupb0BbLXYV49OMMwZo,161200
+lib/libcpp_sphere.a,sha256=g99anoZLBdDDU8hv7Ee8_HGSLqbg8-6FXfYWcLEtNP8,171760
+lib/libZBessel.a,sha256=D8IxeYKpDPJlFk1FjoPJNQx6OpJPkQFhTvw500mvKAo,106200
+lib/lib_ZBessel.a,sha256=PVY_6VWBMWx1cdQudsJqrEcPzSIA5ARWdNHeGvBgmTQ,9840
+lib/libcpp_coreshell.a,sha256=5o1288O00_6wR0FJhZDsmhGSU1vgR_JTVpWTzSi8KPk,171064
+lib/libcpp_base_scatterer.a,sha256=8kPnFpvx_GrrzQJ04WmqsoXXB6YGtxkZ3ZNEvX6Hz0s,172320