PyOptik 1.9.9__tar.gz → 1.9.9.2__tar.gz

pyoptik-1.9.9/.github/workflows/deploy_documentation.yml → pyoptik-1.9.9.2/.github/workflows/build_documentation.yml

@@ -24,11 +24,6 @@ jobs:
         with:
             python-version: 3.11
 
-      - name: Set up Git user
-        run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "actions@github.com"
-
       - name: "Install: Dependencies for headless server"
         shell: bash
         run: |

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/.github/workflows/deploy_PyPi.yml

@@ -1,4 +1,4 @@
-name: Deploy Wheel to PyPi
+name: Deploy to PyPi
 
 on:
   push:
@@ -17,7 +17,7 @@ jobs:
         steps:
           - uses: MartinPdeS/MPSActions/build_pure_python_package@master
             with:
-                python-version: '3.10'
+                python-version: 3.11
 
     publish_wheel:
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
@@ -26,5 +26,5 @@ jobs:
         steps:
           - uses: MartinPdeS/MPSActions/publish_pypi@master
             with:
-                python-version: "3.10"
+                python-version: 3.11
                 password: ${{ secrets.PYPI_API_TOKEN }}

pyoptik-1.9.9.2/.github/workflows/deploy_anaconda.yml

@@ -0,0 +1,45 @@
+name: Deploy to Conda
+
+on:
+  push:
+    branches: [ "master" ]
+    tags:
+      - '*'
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  conda_deployment:
+    name: OS [${{ matrix.os }}] -- Python [${{ matrix.python-version }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python-version: ["3.11", "3.12"]
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Conda environment
+        uses: conda-incubator/setup-miniconda@v3
+        with:
+          channels: conda-forge, martinpdes
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Conda tools
+        run: |
+          conda install anaconda-client conda-build
+
+      - name: Build Conda package
+        run: |
+          conda build . --python ${{ matrix.python-version }}
+          echo "PACKAGE_PATH=$(conda build . --output --python ${{ matrix.python-version }})" >> $GITHUB_ENV
+
+      - name: Upload to Anaconda
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+        env:
+          PACKAGE_PATH: ${{ env.PACKAGE_PATH }}
+        run: |
+          anaconda upload $PACKAGE_PATH --user martinpdes --token ${{ secrets.ANACONDA_API_TOKEN }}

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/.github/workflows/deploy_coverage.yml

@@ -9,7 +9,6 @@ on:
   pull_request:
     branches: [ "master" ]
 
-
 jobs:
   coverage:
     name: Run test and generate coverage data
@@ -20,15 +19,17 @@ jobs:
 
     steps:
       - name: "Set-up: Python ${{ env.cp_python_version }}"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         id: cp310
         with:
-            python-version: "3.10"
+            python-version: "3.11"
+
 
       - name: "Install: Dependencies for headless server"
         shell: bash
         run: |
             sudo apt-get update
+            # sudo apt-get install libgl1-mesa-glx xvfb
             sudo apt-get install xvfb
 
       - name: "Checkout requirements and files for testing"

pyoptik-1.9.9/.github/workflows/static.yml → pyoptik-1.9.9.2/.github/workflows/deploy_documentation.yml

@@ -1,6 +1,7 @@
 # Simple workflow for deploying static content to GitHub Pages
 name: Deploy static content to Pages
 
+
 on:
   workflow_run:
     workflows: ["Documentation"]  # This references the name of the first workflow
@@ -8,7 +9,7 @@ on:
       - completed  # Run when the Documentation workflow is completed successfully
 
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+# Sets permissions of the GITHUB_TOKEN  to allow deployment to GitHub Pages
 permissions:
   contents: write
   pages: write
@@ -16,10 +17,10 @@ permissions:
 
 jobs:
   deploy:
+    runs-on: ubuntu-latest
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
@@ -37,17 +38,25 @@ jobs:
         id: download-artifact
         uses: dawidd6/action-download-artifact@v6
         with:
-          workflow: deploy_documentation.yml
+          workflow: build_documentation.yml
           name: documentation_build
           path: ./documentation_build
 
       - name: Get current tag
         id: get_tag
         run: |
-          # Fetch all tags to ensure we have all relevant history
+          # Fetch all tags to ensure they are available
           git fetch --tags
+          git tag -l
+
+          # Get the latest tag by creation date
+          TAG=$(git tag --sort=-creatordate | head -n 1)
+
+          # Fallback to a default tag if no tag is found
+          if [ -z "$TAG" ]; then
+            TAG="0.0.0.0"
+          fi
 
-          TAG=$(git describe --tags --abbrev=0 || echo "0.0.0.0")
           echo "tag=$TAG" >> $GITHUB_ENV
           echo "Tag found or default: $TAG"
 
@@ -62,7 +71,7 @@ jobs:
           json_file="version_switcher.json"
           rm $json_file
           docs_path="docs"
-          base_url="https://martinpdes.github.io/PyOptik"
+          base_url="https://martinpdes.github.io/PyMieSim"
 
           # Start the JSON array
           echo "[" > $json_file
@@ -97,6 +106,7 @@ jobs:
           # Add and commit the updated version_switcher.json
           git add $json_file
           echo $json_file
+          git add docs/
           git commit --allow-empty -m "Update version_switcher.json"
           git push origin HEAD
 

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/.gitignore

@@ -25,4 +25,4 @@ PyOptik/data/**/example*
 
 # Override for documentation_build
 !documentation_build
-!documentation_build/**
+!documentation_build/**

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyOptik
-Version: 1.9.9
+Version: 1.9.9.2
 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.9.9 → pyoptik-1.9.9.2}/PyOptik/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.9.9'
-__version_tuple__ = version_tuple = (1, 9, 9)
+__version__ = version = '1.9.9.2'
+__version_tuple__ = version_tuple = (1, 9, 9, 2)

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/sellmeier/BAK1.yml

@@ -2,8 +2,10 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "<a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf\">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href=\"http://www.schott.com/advanced_optics/english/download/\">http://www.schott.com</a>)<br>See also <a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf\">SCHOTT glass data sheets</a>"
-COMMENTS: "         "
+REFERENCES: |
+    <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href="http://www.schott.com/advanced_optics/english/download/">http://www.schott.com</a>)<br>See also <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf">SCHOTT glass data sheets</a>
+COMMENTS: |
+             
 DATA:
   - type: formula 2
     wavelength_range: 0.3 2.5
@@ -36,11 +38,9 @@ DATA:
         2.325 2.4209E-06
         2.500 4.2801E-06
 SPECS:
-    n_is_absolute: false
-    wavelength_is_vacuum: false
     temperature: 20.0 °C
     thermal_dispersion:
-      - type: "Schott formula"
+      - type: Schott formula
         coefficients: 1.86e-07 1.29e-08 -1.87e-11 5.25e-07 5.46e-10 0.182
     nd: 1.5725
     Vd: 57.55

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/sellmeier/BK7.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "<a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf\">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href=\"http://www.schott.com/advanced_optics/english/download/\">http://www.schott.com</a>)<br>See also <a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf\">SCHOTT glass data sheets</a>"
-COMMENTS: "step 0.5 available"
+REFERENCES: |
+    <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf">SCHOTT Zemax catalog 2017-01-20b</a>
+    (obtained from <a href="http://www.schott.com/advanced_optics/english/download/">http://www.schott.com</a>)<br>
+    See also <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf">SCHOTT glass data sheets</a>
+COMMENTS: |
+    step 0.5 available
 DATA:
   - type: formula 2
     wavelength_range: 0.3 2.5
@@ -36,11 +40,9 @@ DATA:
         2.325 4.2911E-06
         2.500 8.1300E-06
 SPECS:
-    n_is_absolute: false
-    wavelength_is_vacuum: false
     temperature: 20.0 °C
     thermal_dispersion:
-      - type: "Schott formula"
+      - type: Schott formula
         coefficients: 1.86e-06 1.31e-08 -1.37e-11 4.34e-07 6.27e-10 0.17
     nd: 1.5168
     Vd: 64.17

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/sellmeier/SF5.yml

@@ -2,8 +2,10 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "<a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf\">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href=\"http://www.schott.com/advanced_optics/english/download/\">http://www.schott.com</a>)<br>See also <a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf\">SCHOTT glass data sheets</a>"
-COMMENTS: "step 0.5 available        "
+REFERENCES: |
+    <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href="http://www.schott.com/advanced_optics/english/download/">http://www.schott.com</a>)<br>See also <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf">SCHOTT glass data sheets</a>
+COMMENTS: |
+    step 0.5 available        
 DATA:
   - type: formula 2
     wavelength_range: 0.37 2.5
@@ -30,11 +32,9 @@ DATA:
         2.325 3.4194E-06
         2.500 5.5159E-06
 SPECS:
-    n_is_absolute: false
-    wavelength_is_vacuum: false
     temperature: 20.0 °C
     thermal_dispersion:
-      - type: "Schott formula"
+      - type: Schott formula
         coefficients: -2.51e-07 1.07e-08 -2.4e-11 7.85e-07 1.15e-09 0.278
     nd: 1.67271
     Vd: 32.25

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/sellmeier/ZBLAN.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "F. Gan. Optical properties of fluoride glasses: a review. <a href=\"https://doi.org/10.1016/0022-3093(94)00592-3\"><i>J. Non-Cryst. Solids</i> <b>184</b>, 9–20 (1995)</a>"
-COMMENTS: "Room temperature."
+REFERENCES: |
+    F. Gan.
+    Optical properties of fluoride glasses: a review.
+    <a href="https://doi.org/10.1016/0022-3093(94)00592-3"><i>J. Non-Cryst. Solids</i> <b>184</b>, 9–20 (1995)</a>
+COMMENTS: |
+    Room temperature.
 DATA:
   - type: formula 1
     wavelength_range: 0.365 3.50

pyoptik-1.9.9.2/PyOptik/data/sellmeier/air.yml

@@ -0,0 +1,18 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    P. E. Ciddor.
+    Refractive index of air: new equations for the visible and near infrared.
+    <a href="https://doi.org/10.1364/AO.35.001566"><i>Appl. Optics</i> <b>35</b>, 1566-1573 (1996)</a><br>
+    [<a href="https://github.com/polyanskiy/refractiveindex.info-scripts/blob/master/scripts/Ciddor%201996%20-%20air.py">Calculation script (Python)</a> - can be used to calculate the refractive index of air for specific values of humidity, temperature, pressure, and CO<sub>2</sub> concentration]
+COMMENTS: |
+    Standard air: dry air at 15 °C, 101.325 kPa and with 450 ppm CO<sub>2</sub> content.
+DATA:
+  - type: formula 6
+    wavelength_range: 0.23 1.690
+    coefficients: 0 0.05792105 238.0185 0.00167917 57.362
+SPECS:
+    temperature: 15 °C
+    pressure: 101325 Pa

pyoptik-1.9.9.2/PyOptik/data/sellmeier/argon.yml

@@ -0,0 +1,21 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    1) A. Bideau-Mehu, Y. Guern, R. Abjean, A. Johannin-Gilles.
+    Measurement of refractive indices of neon, argon, krypton and xenon in the 253.7-140.4 nm wavelength range. Dispersion relations and estimated oscillator strengths of the resonance lines.
+    <a href="https://doi.org/10.1016/0022-4073(81)90057-1"><i>J. Quant. Spectrosc. Rad. Transfer</i> <b>25</b>, 395-402 (1981)</a><br>
+    2) T. Larsén.
+    Beitrag zur Dispersion der Edelgase.
+    <a href="https://doi.org/10.1007/BF01343498"><i>Z. Physik</i> <b>88</b>, 389-394 (1934)</a><br>
+    * Sellmeier formula is derived by the authors of ref. 1 using their own data in the 0.1404-0.2537 μm range combined with data from ref. 2 at longer wavelengths.
+COMMENTS: |
+    Standard conditions. 0 °C, 760 torr (101.325 kPa).
+DATA:
+  - type: formula 6
+    wavelength_range: 0.1404 0.5677
+    coefficients: 0 2.50141e-3 91.012 5.00283e-4 87.892 5.22343e-2 214.02
+SPECS:
+    temperature: 0 °C
+    pressure: 101325 Pa

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/sellmeier/crown.yml

@@ -2,8 +2,10 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "<a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf\">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href=\"http://www.schott.com/advanced_optics/english/download/\">http://www.schott.com</a>)<br>See also <a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf\">SCHOTT glass data sheets</a>"
-COMMENTS: "        "
+REFERENCES: |
+    <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href="http://www.schott.com/advanced_optics/english/download/">http://www.schott.com</a>)<br>See also <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf">SCHOTT glass data sheets</a>
+COMMENTS: |
+            
 DATA:
   - type: formula 2
     wavelength_range: 0.31 2.5
@@ -35,11 +37,9 @@ DATA:
         2.325 5.1298E-06
         2.500 8.5849E-06
 SPECS:
-    n_is_absolute: false
-    wavelength_is_vacuum: false
     temperature: 20.0 °C
     thermal_dispersion:
-      - type: "Schott formula"
+      - type: Schott formula
         coefficients: -1.67e-06 8.8e-09 -2.86e-11 5.42e-07 7.81e-10 0.172
     nd: 1.51112
     Vd: 60.41

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/sellmeier/flint.yml

@@ -2,8 +2,10 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "<a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf\">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href=\"http://www.schott.com/advanced_optics/english/download/\">http://www.schott.com</a>)<br>See also <a href=\"http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf\">SCHOTT glass data sheets</a>"
-COMMENTS: "lead containing glass type        "
+REFERENCES: |
+    <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20b.agf">SCHOTT Zemax catalog 2017-01-20b</a> (obtained from <a href="http://www.schott.com/advanced_optics/english/download/">http://www.schott.com</a>)<br>See also <a href="http://refractiveindex.info/download/data/2017/schott_2017-01-20.pdf">SCHOTT glass data sheets</a>
+COMMENTS: |
+    lead containing glass type        
 DATA:
   - type: formula 2
     wavelength_range: 0.32 2.5
@@ -33,11 +35,9 @@ DATA:
         2.325 2.8000E-06
         2.500 4.2123E-06
 SPECS:
-    n_is_absolute: false
-    wavelength_is_vacuum: false
     temperature: 20.0 °C
     thermal_dispersion:
-      - type: "Schott formula"
+      - type: Schott formula
         coefficients: 1.51e-06 1.56e-08 -2.78e-11 9.34e-07 1.04e-09 0.25
     nd: 1.62004
     Vd: 36.37

pyoptik-1.9.9.2/PyOptik/data/sellmeier/fused_silica.yml

@@ -0,0 +1,20 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    1) I. H. Malitson.
+    Interspecimen comparison of the refractive index of fused silica.
+    <a href="https://doi.org/10.1364/JOSA.55.001205"><i>J. Opt. Soc. Am.</i> <b>55</b>, 1205-1208 (1965)</a><br>
+    2) C. Z. Tan.
+    Determination of refractive index of silica glass for infrared wavelengths by IR spectroscopy.
+    <a href="https://doi.org/10.1016/S0022-3093(97)00438-9"><i>J. Non-Cryst. Solids</i> <b>223</b>, 158-163 (1998)</a><br>
+    * Sellmeier formula is reported in Ref. 1 for the 0.21–3.71 μm wavelength range. Ref. 2 verifies the validity of the formula up to 6.7 μm.
+COMMENTS: |
+    Fused silica, 20 °C
+DATA:
+  - type: formula 1
+    wavelength_range: 0.21 6.7
+    coefficients: 0 0.6961663 0.0684043 0.4079426 0.1162414 0.8974794 9.896161
+SPECS:
+    temperature: 20 °C

pyoptik-1.9.9.2/PyOptik/data/sellmeier/germanium.yml

@@ -0,0 +1,18 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    1) Icenogle, B. C. Platt, W. L. Wolfe
+    Refractive indexes and temperature coefficients of germanium and silicon,
+    <a https://doi.org/10.1364/AO.15.002348"><i>Appl. Opt.</i> <b>15</b> 2348-2351 (1976)</a><br>
+    2) N. P. Barnes and M. S. Piltch.
+    Temperature-dependent Sellmeier coefficients and nonlinear optics average power limit for germanium.
+    <a href="https://doi.org/10.1364/JOSA.69.000178"><i>J. Opt. Soc. Am.</i> <b>69</b> 178-180 (1979)</a><br>
+    * Ref. 2 provides temperature-dependent Sellmeier equations based on data from Ref. 1.
+COMMENTS: |
+    293 K (20 °C)
+DATA:
+  - type: formula 2
+    wavelength_range: 2.5 12
+    coefficients: 8.28156 6.72880 0.44105 0.21307 3870.1

pyoptik-1.9.9.2/PyOptik/data/sellmeier/lithium_niobate.yml

@@ -0,0 +1,14 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    D. E. Zelmon, D. L. Small, D. Jundt.
+    Infrared corrected Sellmeier coefficients for congruently grown lithium niobate and 5 mol.% magnesium oxide-doped lithium niobate.
+    <a href="https://doi.org/10.1364/JOSAB.14.003319"><i>J. Opt. Soc. Am. B</i> <b>14</b>, 3319-3322 (1997)</a>
+COMMENTS: |
+    21 °C. Ordinary ray (o). Congruently grown lithium niobate.
+DATA:
+  - type: formula 2
+    wavelength_range: 0.4 5.0
+    coefficients: 0 2.6734 0.01764 1.2290 0.05914 12.614 474.60

pyoptik-1.9.9.2/PyOptik/data/sellmeier/polystyren.yml

@@ -0,0 +1,17 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    N. Sultanova, S. Kasarova, I. Nikolov.
+    Dispersion properties of optical polymers.
+    <a href="http://przyrbwn.icm.edu.pl/APP/ABSTR/116/a116-4-42.html"><i>Acta Physica Polonica A</i> <b>116</b>, 585-587 (2009)</a><br>
+    (fit of the experimental data with the Sellmeier dispersion formula: Mikhail Polyanskiy)
+COMMENTS: |
+    20 °C
+DATA:
+  - type: formula 2
+    wavelength_range: 0.4368 1.052
+    coefficients: 0 1.4435 0.020216
+SPECS:
+    temperature: 20 °C

pyoptik-1.9.9.2/PyOptik/data/sellmeier/silicon.yml

@@ -0,0 +1,18 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    1) C. D. Salzberg and J. J. Villa.
+    Infrared refractive indexes of silicon, germanium and modified selenium glass.
+    <a href="https://doi.org/10.1364/JOSA.47.000244"><i>J. Opt. Soc. Am.</i>, <b>47</b>, 244-246 (1957)</a><br>
+    2) B. Tatian.
+    Fitting refractive-index data with the Sellmeier dispersion formula.
+    <a href="https://doi.org/10.1364/AO.23.004477"><i>Appl. Opt.</i> <b>23</b>, 4477-4485 (1984)</a><br>
+    * Ref. 2 provides a dispersion formula based on data from Ref. 1
+COMMENTS: |
+    26 °C, Unknown purity
+DATA:
+  - type: formula 1
+    wavelength_range: 1.357 11.04
+    coefficients: 0 10.6684293 0.301516485 0.0030434748 1.13475115 1.54133408 1104

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/sellmeier/soda_lime_glass.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "M. Rubin. Optical properties of soda lime silica glasses, <a href=\"https://doi.org/10.1016/0165-1633(85)90052-8\"><i>Sol. Energy Mater.</i> <b>12</b>, 275-288 (1985)</a>"
-COMMENTS: "Clear soda lime silica window glass"
+REFERENCES: |
+    M. Rubin.
+    Optical properties of soda lime silica glasses.
+    <a href="https://doi.org/10.1016/0165-1633(85)90052-8"><i>Sol. Energy Mater.</i> <b>12</b>, 275-288 (1985)</a>
+COMMENTS: |
+    Clear soda lime silica window glass
 DATA:
   - type: formula 5
     wavelength_range: 0.31 4.6

pyoptik-1.9.9.2/PyOptik/data/sellmeier/water.yml

@@ -0,0 +1,16 @@
+# this file is part of refractiveindex.info database
+# refractiveindex.info database is in the public domain
+# copyright and related rights waived via CC0 1.0
+
+REFERENCES: |
+    M. Daimon and A. Masumura.
+    Measurement of the refractive index of distilled water from the near-infrared region to the ultraviolet region.
+    <a href="https://doi.org/10.1364/AO.46.003811"><i>Appl. Opt.</i> <b>46</b>, 3811-3820 (2007)</a>
+COMMENTS: |
+    High performance liquid chromatography (HPLC) distilled water at 19.0 °C.
+DATA:
+  - type: formula 2
+    wavelength_range: 0.182 1.129
+    coefficients: 0 5.672526103E-1 5.085550461E-3 1.736581125E-1 1.814938654E-2 2.121531502E-2 2.617260739E-2 1.138493213E-1 1.073888649E1
+SPECS:
+    temperature: 19.0 °C

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/tabulated/aluminium.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "A. D. Rakić. Algorithm for the determination of intrinsic optical constants of metal films: application to aluminum, <a href=\"https://doi.org/10.1364/AO.34.004755\"><i>Appl. Opt.</i> <b>34</b>, 4755-4767 (1995)</a>"
-COMMENTS: "\"Optical and electron-energy-loss data for evaporated-aluminum films have been critically analyzed and used in an iterative, self-consistent algorithm that represents a combination of the Kramers-Kronig analysis and the semiquantum-model application.\""
+REFERENCES: |
+    A. D. Rakić.
+    Algorithm for the determination of intrinsic optical constants of metal films: application to aluminum.
+    <a href="https://doi.org/10.1364/AO.34.004755"><i>Appl. Opt.</i> <b>34</b>, 4755-4767 (1995)</a>
+COMMENTS: |
+    \Optical and electron-energy-loss data for evaporated-aluminum films have been critically analyzed and used in an iterative, self-consistent algorithm that represents a combination of the Kramers-Kronig analysis and the semiquantum-model application.""
 DATA:
   - type: tabulated nk
     data: |

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/tabulated/calcium.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "A. G. Mathewson and H. P. Myers. Absolute values of the optical constants of some pure metals, <a href=\"https://doi.org/10.1088/0031-8949/4/6/009\"><i>Phys. Scr.</i> <b>4</b>, 291-292 (1971)</a>"
-COMMENTS: "298 K (24.85 °C)"
+REFERENCES: |
+    A. G. Mathewson and H. P. Myers.
+    Absolute values of the optical constants of some pure metals.
+    <a href="https://doi.org/10.1088/0031-8949/4/6/009"><i>Phys. Scr.</i> <b>4</b>, 291-292 (1971)</a>
+COMMENTS: |
+    298 K (24.85 °C)
 DATA:
   - type: tabulated nk
     data: |
@@ -67,6 +71,4 @@ DATA:
         1.54980 0.80774 7.24241
         1.65312 0.88689 7.66724
 SPECS:
-    n_is_absolute: true
-    wavelength_is_vacuum: true
     temperature: 298 K

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/tabulated/copper.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "P. B. Johnson and R. W. Christy. Optical constants of the noble metals, <a href=\"https://doi.org/10.1103/PhysRevB.6.4370\"><i>Phys. Rev. B</i> <b>6</b>, 4370-4379 (1972)</a>"
-COMMENTS: "Room temperature"
+REFERENCES: |
+    P. B. Johnson and R. W. Christy.
+    Optical constants of the noble metals.
+    <a href="https://doi.org/10.1103/PhysRevB.6.4370"><i>Phys. Rev. B</i> <b>6</b>, 4370-4379 (1972)</a>
+COMMENTS: |
+    Room temperature
 DATA:
   - type: tabulated nk
     data: |

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/tabulated/gold.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "P. B. Johnson and R. W. Christy. Optical constants of the noble metals, <a href=\"https://doi.org/10.1103/PhysRevB.6.4370\"><i>Phys. Rev. B</i> <b>6</b>, 4370-4379 (1972)</a>"
-COMMENTS: "Room temperature"
+REFERENCES: |
+    P. B. Johnson and R. W. Christy.
+    Optical constants of the noble metals.
+    <a href="https://doi.org/10.1103/PhysRevB.6.4370"><i>Phys. Rev. B</i> <b>6</b>, 4370-4379 (1972)</a>
+COMMENTS: |
+    Room temperature
 DATA:
   - type: tabulated nk
     data: |

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/tabulated/iron.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "P. B. Johnson and R. W. Christy. Optical constants of transition metals: Ti, V, Cr, Mn, Fe, Co, Ni, and Pd, <a href=\"https://doi.org/10.1103/PhysRevB.9.5056\"><i>Phys. Rev. B</i> <b>9</b>, 5056-5070 (1974)</a>"
-COMMENTS: "Room temperature"
+REFERENCES: |
+    P. B. Johnson and R. W. Christy.
+    Optical constants of transition metals: Ti, V, Cr, Mn, Fe, Co, Ni, and Pd.
+    <a href="https://doi.org/10.1103/PhysRevB.9.5056"><i>Phys. Rev. B</i> <b>9</b>, 5056-5070 (1974)</a>
+COMMENTS: |
+    Room temperature
 DATA:
   - type: tabulated nk
     data: |

{pyoptik-1.9.9 → pyoptik-1.9.9.2}/PyOptik/data/tabulated/nickel.yml

@@ -2,8 +2,12 @@
 # refractiveindex.info database is in the public domain
 # copyright and related rights waived via CC0 1.0
 
-REFERENCES: "P. B. Johnson and R. W. Christy. Optical constants of transition metals: Ti, V, Cr, Mn, Fe, Co, Ni, and Pd, <a href=\"https://doi.org/10.1103/PhysRevB.9.5056\"><i>Phys. Rev. B</i> <b>9</b>, 5056-5070 (1974)</a>"
-COMMENTS: "Room temperature"
+REFERENCES: |
+    P. B. Johnson and R. W. Christy.
+    Optical constants of transition metals: Ti, V, Cr, Mn, Fe, Co, Ni, and Pd.
+    <a href="https://doi.org/10.1103/PhysRevB.9.5056"><i>Phys. Rev. B</i> <b>9</b>, 5056-5070 (1974)</a>
+COMMENTS: |
+    Room temperature
 DATA:
   - type: tabulated nk
     data: |