cleanup followup

This commit is contained in:
Benoît Sierro
2023-10-09 11:41:55 +02:00
parent 8e735127fd
commit c51086353f

View File

@@ -7,7 +7,7 @@ from typing import Any, TypeVar
import numpy as np import numpy as np
import scgenerator.math as math import scgenerator.math as math
from scgenerator import utils from scgenerator import io
from scgenerator.logger import get_logger from scgenerator.logger import get_logger
from scgenerator.physics import units from scgenerator.physics import units
from scgenerator.physics.units import NA, c, epsilon0, kB from scgenerator.physics.units import NA, c, epsilon0, kB
@@ -27,7 +27,7 @@ class Sellmeier:
@classmethod @classmethod
@cache @cache
def load(cls, name: str) -> Sellmeier: def load(cls, name: str) -> Sellmeier:
mat_dico = utils.load_material_dico(name) mat_dico = io.load_material_dico(name)
s = mat_dico.get("sellmeier", {}) s = mat_dico.get("sellmeier", {})
return cls( return cls(
**{ **{
@@ -109,7 +109,7 @@ class Gas:
def __init__(self, gas_name: str): def __init__(self, gas_name: str):
self.name = gas_name self.name = gas_name
self._raw_sellmeier = utils.load_material_dico(gas_name) self._raw_sellmeier = io.load_material_dico(gas_name)
self.atomic_mass = self._raw_sellmeier["atomic_mass"] self.atomic_mass = self._raw_sellmeier["atomic_mass"]
self.atomic_number = self._raw_sellmeier["atomic_number"] self.atomic_number = self._raw_sellmeier["atomic_number"]
self.ionization_energy = self._raw_sellmeier.get("ionization_energy") self.ionization_energy = self._raw_sellmeier.get("ionization_energy")