Skip to content

1.1.28 #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Morisset merged 3 commits into from
Jun 1, 2025
Merged

1.1.28 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29006d7
add chianti 11
Morisset Jun 1, 2025
f584dac
1.1.28
Morisset Jun 1, 2025
ba681ae
add changes file
Morisset Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGES/1.1.27-1.1.28.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
adding reading of Chianti v11 database.
12 changes: 6 additions & 6 deletions pyneb/utils/pn_chianti.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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'
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down