PyMieSim 3.5.4.1__cp310-cp310-win_amd64.whl → 3.5.4.3__cp310-cp310-win_amd64.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,25 +1,25 @@
+lib/lib_ZBessel.a,sha256=VnqIXli9K9pfkldxnep2bB897rSdeh9BdJc2mgmzAIw,10676
+lib/libcpp_base_scatterer.a,sha256=YobPrrig-o6FKlB0C2mOtJZ1f_umNUASo7z-RySBBKg,275118
+lib/libcpp_coreshell.a,sha256=yg9hVrqxIzaaqUfgO1Ls4oHhBWVPRMpW9b-BYkqFnOY,278146
+lib/libcpp_cylinder.a,sha256=DIt2Tf5ZQ1PQ5Xe_FzZ3fHrCuyq739UaBwjoXTYFas4,259476
+lib/libcpp_sphere.a,sha256=st6T-gs_-S1sG5kHRO_ORK8it5YboCoNfut9Xvg5tB4,272358
+lib/libZBessel.a,sha256=5xbNMpsEK0WE1Pt_hruOuoAtcQoGmkmc0XvXIHwTSBw,133174
 PyMieSim/__init__.py,sha256=ATPcasYo6e8DbNhyXGPN8lRhB_mcOGvNV-kO82U9Z5k,260
 PyMieSim/__main__.py,sha256=ZSJaGgDhOSzpwPZLLrqyzu6JH5nO7KPHblCD8OMuF4A,180
-PyMieSim/_version.py,sha256=no67bqIZ7U0SY30SeIkHz3M6tQ_4IwM-0f1BbFh5Dvk,537
+PyMieSim/_version.py,sha256=SPA2ARbwEu3rmTOQ07I3xcu74m_6fSX88nf8mSfbM_U,537
 PyMieSim/binary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PyMieSim/binary/interface_detector.cp310-win_amd64.pyd,sha256=klJpzOdaz8ih08zNVsC_DKCj_WKYvydHUtTDVQgGyxg,760320
-PyMieSim/binary/interface_experiment.cp310-win_amd64.pyd,sha256=BvG0JmNR5cqOFeEtn492vrEaNYKECmi589TlqrYI_Ss,797696
-PyMieSim/binary/interface_scatterer.cp310-win_amd64.pyd,sha256=H7y81yytawszv-dxw251Ykztl2NDYR83kp2-Bi_wYQo,1175040
-PyMieSim/binary/interface_sets.cp310-win_amd64.pyd,sha256=GkO1fCeHP2gLRESisKqykLkfq1Ev8iDaooGwgqDUaVk,1178624
-PyMieSim/binary/interface_source.cp310-win_amd64.pyd,sha256=OGQAke7_uqolHMSoD_FgzCt6DujXsXvV05efx9AgsEQ,539648
-PyMieSim/binary/lib_ZBessel.a,sha256=3g-LmCKMzD8tI-K30Fi3h9i7wLEfyR2TZFxRuIDm3UM,10676
-PyMieSim/binary/libcpp_base_scatterer.a,sha256=wji07UZo5tpYBH-4oYBM8C73fEH-H4NStuiQhLWYlgE,275118
-PyMieSim/binary/libcpp_coordinates.a,sha256=GxaUGeUl_1ooJZ-YeHxw7e2BH68awetukkly5JAs1-c,23506
-PyMieSim/binary/libcpp_coreshell.a,sha256=3C9hHgRx5IQmqT9y_R-Liug9qeW0WN1J-w8xDZ3Upvo,278108
-PyMieSim/binary/libcpp_cylinder.a,sha256=b39FZjboH7oZU2QVkesC1udGE8lSAynmyXfCOFUGPzE,259012
-PyMieSim/binary/libcpp_detector.a,sha256=VkoRoNjDxZBC3EVxfK7iolzc_4DwwGjjVw2347noOKQ,280566
-PyMieSim/binary/libcpp_experiment.a,sha256=uhVGHOHGd-7hZzRmHljG-y-9zcSL44Yd3kghybJggr4,238940
-PyMieSim/binary/libcpp_fibonacci.a,sha256=VvIqrsyv5AOJ7SvWokB4jp70-TNA8OlESEzE7g732Pk,16808
-PyMieSim/binary/libcpp_mode_field.a,sha256=9QCBCbTPh69tEWKiL9TPu1srh18hENYh-pGPKQxEIh8,13388
-PyMieSim/binary/libcpp_sets.a,sha256=sK0yKvjHLJzSDLIP5_DEiU15bmBAgp-mcOFjk9tfGpQ,238854
-PyMieSim/binary/libcpp_source.a,sha256=H8e0xSX750_zJtFoK1Np_lBZeGHmwjtYwFSpX_V80sY,4070
-PyMieSim/binary/libcpp_sphere.a,sha256=S3gEQCkLF9LcozWcvcv6rEDoNj8JR2seTU3__ew58Zw,272324
-PyMieSim/binary/libZBessel.a,sha256=x0woMYGza1NnUFCBRGdCe2bqLtsB85sdKIUvjkN6zKM,133174
+PyMieSim/binary/interface_detector.cp310-win_amd64.pyd,sha256=k_eFMo3StUEQDOdeIacs0DbZG4vwoZaxk-8RPsCyEVI,755712
+PyMieSim/binary/interface_experiment.cp310-win_amd64.pyd,sha256=XKfGab5bUHMZPVK_c5qNsVtRE9uE4NIArcCBFpZbLk0,797696
+PyMieSim/binary/interface_scatterer.cp310-win_amd64.pyd,sha256=4Ot0KbxHCfRgTJKOJfPxWzpsM6FWdKyB5Vig0i6-2YE,1171968
+PyMieSim/binary/interface_sets.cp310-win_amd64.pyd,sha256=_WVxNPVZkRnlhk_7LSaweouzs-giwNglHL42l-kGYBs,1178624
+PyMieSim/binary/interface_source.cp310-win_amd64.pyd,sha256=yOLgbVBPeOKYZrENJDeUlEPnolzflrjjJgYLlGVAwgs,539648
+PyMieSim/binary/libcpp_coordinates.a,sha256=G0ePnS04Tb3zN1VZyiR2WMyOqMy22B8b7hj3aAml7Jw,23506
+PyMieSim/binary/libcpp_detector.a,sha256=QvZPm8DgpGhDvUngUB8_yzU0EC9jQqAU_iPJ9GaOWvc,280582
+PyMieSim/binary/libcpp_experiment.a,sha256=VjJuxgXS7SRllm3PzVson0EhFf7xh6H6VsbsTBL0hK0,238940
+PyMieSim/binary/libcpp_fibonacci.a,sha256=xKmzrTtK6JGHhYzW_doMkEK_C8D2lkQe5uqzvFOpbsE,16808
+PyMieSim/binary/libcpp_mode_field.a,sha256=XlEJisgBBb-Olg3kO0VuomVnFqu_WwH6IQZNahRiiCE,13388
+PyMieSim/binary/libcpp_sets.a,sha256=97idX2JTjxrP8jEXqTNxc0YTNOzNrb4gWdfo2XM1olI,238854
+PyMieSim/binary/libcpp_source.a,sha256=Tr3taFsPqyD7_pd02H075fIfzJJqaUkLn2_qrSMrSYg,4070
 PyMieSim/directories.py,sha256=x8nf0HACHDuny0YQ3sPnktY8aCKOA1RDvbDTSrerGN0,679
 PyMieSim/experiment/__init__.py,sha256=3W7RgRQ2wspQyhAsUUfd5oYx199lQbYv90Lf0A5Ypf4,46
 PyMieSim/experiment/dataframe_subclass.py,sha256=WVVbvLmdPaqgFU48f8Ua0-WOlNj-CDpK_tFNCDC5ixU,7394
@@ -28,15 +28,15 @@ PyMieSim/experiment/detector/base.py,sha256=R2kObUqhY1FicedybH7xn4DJu50-SdAWtHc2
 PyMieSim/experiment/detector/coherent_mode.py,sha256=5bnQ0j22R5-6ALR9_3wseF01JOiSk9iii2opvcsaQpc,1855
 PyMieSim/experiment/detector/photodiode.py,sha256=Hpw9Nxo19QUV-r31LCuEl2-EOgUPDEbkbOVB0zPyw8s,1902
 PyMieSim/experiment/scatterer/__init__.py,sha256=Daf3HTH5jA5Br5R3hb0NQSVZAz5NpaiedGUQG1bYtkU,128
-PyMieSim/experiment/scatterer/base.py,sha256=8ZInPzjBpwOsC13L7oAZ6dD9ISHcWLRSzAbX3gKCxfY,3849
-PyMieSim/experiment/scatterer/core_shell.py,sha256=OO5-Rg5WKmsFCi1JoMR134WO-bHXQLz8nVRa11TT3YA,3327
-PyMieSim/experiment/scatterer/cylinder.py,sha256=FiPeZROIiDmLgGekLK5y0kTHvTnxh6oGJ1m59NA-Kmc,2511
-PyMieSim/experiment/scatterer/sphere.py,sha256=rM0miEr8qIht8HO3zSvh3a8pvCyjIn8QghlF82DpVYo,2821
+PyMieSim/experiment/scatterer/base.py,sha256=3wKHLeOnXIXNK9ZE8-q0vNVjeYP2pJV4191DuGSfRuQ,3977
+PyMieSim/experiment/scatterer/core_shell.py,sha256=2HQI285zd63hY0DaDNUwyeOEaDaE5DX3dF9WG9SyhRU,3552
+PyMieSim/experiment/scatterer/cylinder.py,sha256=bpypSsx23WAOx9FEdnkepJI0tfIKBbUndXR7DDjktHw,2601
+PyMieSim/experiment/scatterer/sphere.py,sha256=hiv8rXTm-7BEhE0d48jX9KvSoaxiD1KkmNaC7O9J5sM,2911
 PyMieSim/experiment/setup.py,sha256=bNbiKh77TX94qKBhDP9PBjE5WZ6b_uQXMK-7R5CrrBI,13649
 PyMieSim/experiment/source/__init__.py,sha256=QOwlP9wBNAlQA3dmH-g8mNpb2qu5hFdlD_zkmw88Q8w,66
 PyMieSim/experiment/source/base.py,sha256=bkIM2UDO8APBi6MPWWGrapkSqddQBmiCScJ3Y2Q741c,3189
-PyMieSim/experiment/source/gaussian.py,sha256=glmSVMXMJqZ4VDWGjp31wpmTX0eXx_p4MrqWjUEAWxE,2354
-PyMieSim/experiment/source/planewave.py,sha256=qMr3T-RBWjmLJD4ep6ofPwHa9YurOm65Ja85tSopb4Q,2557
+PyMieSim/experiment/source/gaussian.py,sha256=00FAe2dHDefDNFr-nh3yA9P4dvtoVfdQmDI36G6wdLI,2390
+PyMieSim/experiment/source/planewave.py,sha256=rZtCS_fOk--WzUg8tz7e5QwHZy_3N9KS-QP4jgo6gXI,2548
 PyMieSim/experiment/utils.py,sha256=pVdLsLYACnOt1aKPmLO9qLC9I2a9paN4ypMF3TIaaGA,5512
 PyMieSim/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PyMieSim/gui/helper.py,sha256=GWrG91CBVgMruvwvQbhfU_07ZhbIBkgAs3FwOvCPhe8,2605
@@ -80,7 +80,7 @@ PyMieSim/validation_data/pymiescatt/validation_Qsca_coreshell_1.csv,sha256=fW1pa
 PyMieSim/validation_data/pymiescatt/validation_Qsca_coreshell_2.csv,sha256=khOJo3N54CqvrG9sxpuvvv5mZlcF3awOk738WHLougI,10400
 PyMieSim/validation_data/pymiescatt/validation_Qsca_medium.csv,sha256=7PE_F3sLIKmKPhcoMUxeByZHw3lzDfc3TH9g9bh3Noo,20800
 PyMieSim/validation_data/pymiescatt/validation_sphere.csv,sha256=0VCbInLU-PcTMa8IOsGL9vBWYJ9tQ6FpMv3ApV8fQVY,143548
-pymiesim-3.5.4.1.dist-info/METADATA,sha256=lF-Jv_Pr0ijVs5CZmGwC_LF4dH68v33pIcICD6h1zMo,13472
-pymiesim-3.5.4.1.dist-info/WHEEL,sha256=Bg3xfVZCdvCQkqUyMs2y8LOfK6ua4a-d4Njc-PtQZvk,106
-pymiesim-3.5.4.1.dist-info/licenses/LICENSE,sha256=Iiz1zBIAocPfqqVpPTakp8OKXY9K5j4bIRbgaXy2iAE,1109
-pymiesim-3.5.4.1.dist-info/RECORD,,
+pymiesim-3.5.4.3.dist-info/METADATA,sha256=3QF4Pz6lqkM-onxvKsHs4zMk7yLajZ-4mZx9uSpp8dM,13472
+pymiesim-3.5.4.3.dist-info/WHEEL,sha256=Bg3xfVZCdvCQkqUyMs2y8LOfK6ua4a-d4Njc-PtQZvk,106
+pymiesim-3.5.4.3.dist-info/licenses/LICENSE,sha256=Iiz1zBIAocPfqqVpPTakp8OKXY9K5j4bIRbgaXy2iAE,1109
+pymiesim-3.5.4.3.dist-info/RECORD,,