diff --git a/docs/CHANGES/1.1.27-1.1.28.txt b/docs/CHANGES/1.1.27-1.1.28.txt new file mode 100644 index 0000000..5ea0ddb --- /dev/null +++ b/docs/CHANGES/1.1.27-1.1.28.txt @@ -0,0 +1 @@ +adding reading of Chianti v11 database. diff --git a/pyneb/utils/pn_chianti.py b/pyneb/utils/pn_chianti.py index 70e0c70..b5ac3cc 100644 --- a/pyneb/utils/pn_chianti.py +++ b/pyneb/utils/pn_chianti.py @@ -9,7 +9,7 @@ from . import _chianti_tools_8 as _chianti_tools elif pn.config.Chianti_version_main == '7': from . import _chianti_tools -elif pn.config.Chianti_version_main in ('9', '10'): +elif pn.config.Chianti_version_main in ('9', '10', '11'): from . import _chianti_tools_9 as _chianti_tools from . import _chianti_constants as const from .physics import sym2name, vactoair @@ -150,7 +150,7 @@ def Chianti_getOmega(ion_chianti, tem, lev1=None, lev2=None, Splups=None, NLevel pn.log_.debug('NLevels = {}'.format(NLevels), calling='Chianti_getOmega') temp=np.asarray(tem) if Splups is None: - if pn.config.Chianti_version_main in ('8', '9', '10'): + if pn.config.Chianti_version_main in ('8', '9', '10', '11'): Splups = _chianti_tools.scupsRead(ion_chianti) elif pn.config.Chianti_version_main == '7': Splups = _chianti_tools.splupsRead(ion_chianti) @@ -187,7 +187,7 @@ def Chianti_getOmega(ion_chianti, tem, lev1=None, lev2=None, Splups=None, NLevel isplups = isplups[0] ttype=Splups["ttype"][isplups] cups=Splups["cups"][isplups] - if pn.config.Chianti_version_main in ('8', '9', '10'): + if pn.config.Chianti_version_main in ('8', '9', '10', '11'): nspl=Splups["ntemp"][isplups] dx=1./(float(nspl)-1.) xs = Splups['btemp'][isplups] @@ -472,7 +472,7 @@ def __init__(self, elem=None, spec=None, atom=None, NLevels=None, TemArray=np.lo self._loadChianti() def _loadChianti(self): - if pn.config.Chianti_version_main in ('8', '9', '10'): + if pn.config.Chianti_version_main in ('8', '9', '10', '11'): self.fullFileName = _chianti_tools.ion2filename(self.ion_chianti) + '.scups' elif pn.config.Chianti_version_main == '7': self.fullFileName = _chianti_tools.ion2filename(self.ion_chianti) + '.splups' @@ -484,7 +484,7 @@ def _loadChianti(self): self.Chianti_version = self.collPath.split('/')[-4] self.comments = {} - if pn.config.Chianti_version_main in ('8', '9', '10'): + if pn.config.Chianti_version_main in ('8', '9', '10', '11'): self.Splups = _chianti_tools.scupsRead(self.ion_chianti) elif pn.config.Chianti_version_main == '7': self.Splups = _chianti_tools.splupsRead(self.ion_chianti) @@ -612,7 +612,7 @@ def getSources(self): sources = [] sources.append('Omega-values from {0}'.format(self.Chianti_version)) - if pn.config.Chianti_version_main in ('8', '9','10'): + if pn.config.Chianti_version_main in ('8', '9','10', '11'): refs = _chianti_tools.scupsRead(self.ion_chianti) elif pn.config.Chianti_version_main == '7': refs = _chianti_tools.splupsRead(self.ion_chianti) diff --git a/pyproject.toml b/pyproject.toml index 2c2cde9..8d0726b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "pyneb" -version = "1.1.27" +version = "1.1.28" requires-python = ">= 3.8" dynamic = ["dependencies"] description = "A Python package for nebular analysis"