PyMieSim 3.5.4.1__cp312-cp312-macosx_14_0_arm64.whl → 3.5.4.3__cp312-cp312-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=I1cjv22AH4f535uJ7LXi2cB9hHnwWJJUjEcKzY-eyp0,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,48 +58,44 @@ 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/interface_source.cpython-312-darwin.so,sha256=EPA191SxHTaPC-v4ZzW2iXise06LypOvWjV_fyIxbz4,222784
 PyMieSim/binary/interface_experiment.cpython-311-darwin.so,sha256=ZYR0Asnh4bKtRVz7N-fiac4rQunvw_HAo0HzPKYJm6U,473360
-PyMieSim/binary/interface_sets.cpython-312-darwin.so,sha256=XmDsmr4ih9YbB3v8kax8kOF18_2-mHBvqUXzBVG9Zy8,562016
-PyMieSim/binary/interface_scatterer.cpython-312-darwin.so,sha256=4aQszpDdd-jypCyK_OyoFRqjj-xThAy87eibRbZZRB0,542240
-PyMieSim/binary/libcpp_cylinder.a,sha256=R2WlNohO9SVu8ESPw4pcpdX0YDgHnMQKOvlL4R-GsMc,166144
-PyMieSim/binary/libcpp_coordinates.a,sha256=P2zNkoXHB3zmZc72bM7H0imhb6w1rq6OoMxEpJle3NI,22432
-PyMieSim/binary/interface_detector.cpython-312-darwin.so,sha256=DXLaIUZAK0EUaEhIBUsxjREcGMCx6hNaiXWZQLyU8is,457920
-PyMieSim/binary/libcpp_source.a,sha256=szn--4ycmkJKYjenq6lJVtXHnYLjFHrPWOxAVsVn0Ac,6720
+PyMieSim/binary/interface_sets.cpython-312-darwin.so,sha256=IPe1pjrQtuy-UWNj1sN-zUlntXG_AV53jmTrZRM_i0M,562016
+PyMieSim/binary/interface_scatterer.cpython-312-darwin.so,sha256=4ka3rTKssXXT2xjE_KEohF5yYqnZznjjve2ypz4r6c4,542224
+PyMieSim/binary/libcpp_coordinates.a,sha256=wjIp7Qdi5I8veGDFyHm6HTGxmAplSfSXPonr-paIhvs,22432
+PyMieSim/binary/interface_detector.cpython-312-darwin.so,sha256=OlnGovl3xddKkYQF1oQAZtt_aqIhnRcJvKMOdE-n9_E,457888
+PyMieSim/binary/libcpp_source.a,sha256=hbASYGd_ZS4Lq9QqwH8Odn-LoddMeLvXW3HLHOM0VS8,6720
 PyMieSim/binary/interface_experiment.cpython-310-darwin.so,sha256=UCgdLZHrbVmEZ432PUrIHE8P8lAlM_IDyx0hEZqd3nU,456752
-PyMieSim/binary/libcpp_sphere.a,sha256=YsC8qahKE1_7Ggt2VFW146-fq-BwUByPiNJPgPLCr6M,179784
 PyMieSim/binary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PyMieSim/binary/interface_detector.cpython-311-darwin.so,sha256=dF2k-Qb73SRJ4dIIfflq2TLhGGrpMahtc271RlxSIbQ,457200
+PyMieSim/binary/interface_detector.cpython-311-darwin.so,sha256=EqTCLRbdgxAlJWAjzMSFZDqpZOyphvlkd6jV3TJNySE,440640
 PyMieSim/binary/interface_source.cpython-310-darwin.so,sha256=rpdCj8Y6nvkHYAgsvGPdpXw6Tuc5QJrEko0qyPz80hc,223664
-PyMieSim/binary/libcpp_fibonacci.a,sha256=A7MPEgqA12hJjBgusRoDfY4Oto2zK1yTFUH_Ryp7_YY,14160
-PyMieSim/binary/libZBessel.a,sha256=MaQnrchO4EYJSTRXbaDcFTDzxTX2lbJOB4fjZAOSt1g,106200
-PyMieSim/binary/interface_sets.cpython-310-darwin.so,sha256=mOuQ-k55bFh1pg15iLQSAp-C3Qiqh4cCyU1OiOYSqts,544672
-PyMieSim/binary/libcpp_experiment.a,sha256=zNnf_CKYtBo3c3T46AuT0OzqvsrUInLVyu3mkgRZa1o,155272
-PyMieSim/binary/lib_ZBessel.a,sha256=9zNuAFlvMNKb0dviHEVbSWdRLmpLvbIKrOjNAcOQghY,9840
-PyMieSim/binary/libcpp_coreshell.a,sha256=MNFbkyj8YNr3h0Oxlw0Uj8LN-shfcWgPzG-M5Tc-PTc,178784
-PyMieSim/binary/libcpp_mode_field.a,sha256=-Rl5_Jy-HjtLGIcAq8PB8p9SU7tBi9pDFRkvz0B1tbA,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_fibonacci.a,sha256=IiCSX_ngsaFgmY19P9EThk8f8iWP3LVYGeXhfMvnfUM,14160
+PyMieSim/binary/interface_sets.cpython-310-darwin.so,sha256=BNlKN6BC7ORNSA8BugkD3RGHQHToa79lKOmbTrhoGhQ,544672
+PyMieSim/binary/libcpp_experiment.a,sha256=c8jFa5UewImQ6R8QkMU5m8IlbAd9i33_Ht9Nt2L5uRk,155272
+PyMieSim/binary/libcpp_mode_field.a,sha256=z8HyrNHvMu7XwkYfXsLjf_iLq5mlBj-NkctVwxOfT5A,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/interface_source.cpython-311-darwin.so,sha256=AM5oXZa5UaGwoir1IfrC8_kixE_72pTlvfQ2OSid-io,223664
-PyMieSim/binary/interface_sets.cpython-311-darwin.so,sha256=V8GFAnAN4bVp8nNgFVuDJMtfT5UKoOGedlLtVxWovL8,544784
+PyMieSim/binary/interface_sets.cpython-311-darwin.so,sha256=DtDLUpnG7LU484HBVYUatlFIkuN0l5dkMV1imd73hb8,544784
 PyMieSim/binary/interface_experiment.cpython-312-darwin.so,sha256=KhGwhhLYjh5jNrV1wNzKq1Ka7idTaiEiR2q_nEY8Ntw,474096
-PyMieSim/binary/libcpp_base_scatterer.a,sha256=kS93fVMmIqv3pfeWM2Jan8I6IEzhmCrWxmPBFxq9TBQ,177280
-PyMieSim/binary/libcpp_sets.a,sha256=sAcnDx7MnZTd2wxICEdzxOPD-IqlDJgpmgXf-CLwqDc,155264
-PyMieSim/binary/interface_scatterer.cpython-311-darwin.so,sha256=RvQuN_omEsNGyiMg0wvTs728DbB3Lk4HRKn8uDLoU9Q,541504
-PyMieSim/binary/libcpp_detector.a,sha256=XovNNSP-A7vFg8Cq0J6byr5O6-HKMsnrh1Wlc9dSuyU,181528
-pymiesim-3.5.4.1.dist-info/RECORD,,
-pymiesim-3.5.4.1.dist-info/WHEEL,sha256=I1cjv22AH4f535uJ7LXi2cB9hHnwWJJUjEcKzY-eyp0,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_sets.a,sha256=xv86-QtXIUKutygoT0fEPm7HTgL1cpPy46ocYVxXz7A,155264
+PyMieSim/binary/interface_scatterer.cpython-311-darwin.so,sha256=Rrdyt7_zGTjggoAjay7LPquY9vYCh1-8ZaEMaCR_HDg,541488
+PyMieSim/binary/libcpp_detector.a,sha256=UKOymAGFfUO2xq8ZdoEcNGTKefJuphZQaPj5rH0Y2is,181528
+lib/libcpp_cylinder.a,sha256=WoVVi1XdHg6_GgBIHI5SVqWulo6gyQxNwMHnP9ScTiY,166352
+lib/libcpp_sphere.a,sha256=OzZ_cqkpBc_-nmkYcPRyhhOlpYdF46d5LIIWIxl5BjM,179784
+lib/libZBessel.a,sha256=JZ5TxQpVGGfHkRnBsdpAmXSgK02hmNDU_fjrSE9ifdk,106200
+lib/lib_ZBessel.a,sha256=hcNAEFP7QbIp5eWb996uZ0XUrGwXlkHouQKDFcfDfwc,9840
+lib/libcpp_coreshell.a,sha256=m4bT_fDACqEXrzFFbM9xgInkpBtoSt0UKt5PWmbeD-Q,178784
+lib/libcpp_base_scatterer.a,sha256=lFJiyZ25aLlE8rqIdOtSat6EfdF5dsNkB6DhzV62fyU,177280