PyOptik 1.1.3.post0__tar.gz → 1.1.4.post0__tar.gz

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/.gitignore

@@ -4,6 +4,7 @@
 *.so
 *.pytest_cache
 *htmlcov
+*.coverage
 
 dist
 build

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/PKG-INFO

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

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/PyOptik/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.3.post0'
-__version_tuple__ = version_tuple = (1, 1, 3)
+__version__ = version = '1.1.4.post0'
+__version_tuple__ = version_tuple = (1, 1, 4)

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/PyOptik/material.py

@@ -1,5 +1,7 @@
+from typing import Union
 from PyOptik.sellmeier_class import SellmeierMaterial
 from PyOptik.tabulated_class import TabulatedMaterial
+from PyOptik import data
 
 class staticproperty(property):
   def __get__(self, owner_self, owner_cls):
@@ -19,8 +21,20 @@ class UsualMaterial:
         'BK7',
         'fused_silica',
         'germanium',
+        'polystyren'
     ]
 
+    @staticmethod
+    def get(material_name: str) -> Union[SellmeierMaterial, TabulatedMaterial]:
+        if material_name in data.sellmeier.material_list:
+            return SellmeierMaterial(material_name)
+
+        if material_name in data.tabulated.material_list:
+            return TabulatedMaterial(material_name)
+
+        raise FileNotFoundError(f'Material: [{material_name}] could not be found.')
+
+
     @staticproperty
     def silver():
         return TabulatedMaterial('silver')
@@ -45,6 +59,10 @@ class UsualMaterial:
     def iron():
         return TabulatedMaterial('iron')
 
+    @staticproperty
+    def polystyren():
+        return SellmeierMaterial('polystyren')
+
     @staticproperty
     def argon():
         return SellmeierMaterial('argon')
@@ -67,4 +85,4 @@ class UsualMaterial:
 
     @staticproperty
     def germanium():
-        return SellmeierMaterial('germanium')
+        return SellmeierMaterial('germanium')

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/PyOptik/tabulated_class.py

@@ -63,7 +63,7 @@ class TabulatedMaterial(Material):
         n_interp = interp1d(self.wavelength, self.n_values, kind='cubic', fill_value='extrapolate')
         k_interp = interp1d(self.wavelength, self.k_values, kind='cubic', fill_value='extrapolate')
 
-        return n_interp(wavelength), k_interp(wavelength)
+        return n_interp(wavelength) + 1j * k_interp(wavelength)
 
     def plot(self) -> None:
         """

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/PyOptik.egg-info/PKG-INFO

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

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/PyOptik.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.coverage
 .gitignore
 .readthedocs.yml
 LICENSE

{pyoptik-1.1.3.post0 → pyoptik-1.1.4.post0}/tests/test_usual_material.py

@@ -9,9 +9,17 @@ def test_usual_material(material_name):
     """
     material_instance = getattr(UsualMaterial, material_name)
 
-    print(material_instance.__class__)
-
     assert isinstance(material_instance, (SellmeierMaterial, TabulatedMaterial)), f"{material_name} instantiation failed."
 
+@pytest.mark.parametrize('material_name', UsualMaterial.all, ids=lambda name: f'Test {name}')
+def test_get_material(material_name):
+    """
+    Test each usual material defined in UsualMaterial to ensure that it can be instantiated without errors.
+    """
+    material_instance = UsualMaterial.get('silver')
+
+    assert isinstance(material_instance, TabulatedMaterial), f"{material_name} instantiation failed."
+
+
 if __name__ == "__main__":
     pytest.main([__file__])