PyOptik 2.0.0__tar.gz → 2.0.1__tar.gz

{pyoptik-2.0.0 → pyoptik-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOptik
-Version: 2.0.0
+Version: 2.0.1
 Summary: A package for refractive index values.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License

{pyoptik-2.0.0 → pyoptik-2.0.1}/PyOptik/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.0.0'
-__version_tuple__ = version_tuple = (2, 0, 0)
+__version__ = version = '2.0.1'
+__version_tuple__ = version_tuple = (2, 0, 1)
 
-__commit_id__ = commit_id = 'g9ce3b3906'
+__commit_id__ = commit_id = 'g052103443'

{pyoptik-2.0.0 → pyoptik-2.0.1}/PyOptik/material/sellmeier_class.py

@@ -89,13 +89,13 @@ class SellmeierMaterial(BaseMaterial):
         self.reference = parsed_yaml.get('REFERENCES', None)
 
     @validate_units
-    def compute_refractive_index(self, wavelength: Length) -> RefractiveIndex:
+    def compute_refractive_index(self, wavelength: Length | float) -> RefractiveIndex:
         r"""
         Computes the refractive index n(\u03bb) using the appropriate formula (either Formula 1, 2, 5, or 6).
 
         Parameters
         ----------
-        wavelength : Length
+        wavelength : Length | float
             The wavelength \u03bb in meters, can be a single float or a numpy array.
 
         Returns
@@ -108,6 +108,9 @@ class SellmeierMaterial(BaseMaterial):
         ValueError
             If the wavelength is outside the specified range or if an unsupported formula type is encountered.
         """
+        if not isinstance(wavelength, Length):
+            wavelength = wavelength * ureg.meter
+
         return_as_scalar = numpy.isscalar(wavelength.magnitude)
 
         wavelength = numpy.atleast_1d(wavelength)

{pyoptik-2.0.0 → pyoptik-2.0.1}/PyOptik/material/tabulated_class.py

@@ -6,7 +6,7 @@ from typing import Optional, Union
 import yaml
 import matplotlib.pyplot as plt
 from MPSPlots.styles import mps
-from TypedUnit import Length, RefractiveIndex, validate_units, ureg
+from TypedUnit import Length, validate_units, ureg
 
 from PyOptik.material.base_class import BaseMaterial
 from PyOptik.directories import tabulated_data_path
@@ -93,13 +93,13 @@ class TabulatedMaterial(BaseMaterial):
         self.reference = parsed_yaml.get('REFERENCES', None)
 
     @validate_units
-    def compute_refractive_index(self, wavelength: Length) -> numpy.ndarray:
+    def compute_refractive_index(self, wavelength: Length | float) -> numpy.ndarray:
         """
         Interpolates the refractive index (n) and absorption (k) values for the given wavelength(s).
 
         Parameters
         ----------
-        wavelength : Length
+        wavelength : Length | float
             Wavelength(s) in micrometers for which to interpolate n and k.
 
         Returns
@@ -112,6 +112,9 @@ class TabulatedMaterial(BaseMaterial):
         ValueError
             If the wavelength is outside the tabulated range.
         """
+        if not isinstance(wavelength, Length):
+            wavelength = wavelength * ureg.meter
+
         return_as_scalar = numpy.isscalar(wavelength.magnitude)
 
         wavelength = numpy.atleast_1d(wavelength)

{pyoptik-2.0.0 → pyoptik-2.0.1}/PyOptik.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOptik
-Version: 2.0.0
+Version: 2.0.1
 Summary: A package for refractive index values.
 Author-email: Martin Poinsinet de Sivry-Houle <martin.poinsinet.de.sivry@gmail.com>
 License: MIT License

{pyoptik-2.0.0 → pyoptik-2.0.1}/tests/test_sellmeier.py

@@ -165,6 +165,19 @@ def test_material_string_representation():
     assert isinstance(material_repr, str)
     assert isinstance(material_print, str)
 
+def test_compute_refractive_index_single_wavelength():
+    """Test computation of refractive index for given wavelengths."""
+    material = Material('water')
+
+    # Test single wavelength input
+    wavelength = 500 * ureg.nanometer
+    refractive_index_0 = material.compute_refractive_index(wavelength)
+
+    refractive_index_1 = material.compute_refractive_index(wavelength.to('meter').magnitude)
+
+    assert np.isclose(refractive_index_0, refractive_index_1)
+
+
 
 if __name__ == "__main__":
     pytest.main(["-W error", "-s", __file__])