Skip to content
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

Jump to bottom

tardis/plasma/standard_plasmas.py: old database files warning #799

Merged
merged 7 commits into from
Nov 4, 2017
Merged

tardis/plasma/standard_plasmas.py: old database files warning #799

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3af33a0
tardis/plasma/standard_plasmas.py: old database files warning
Oct 15, 2017
a594d2c
tardis/plasma/standard_plasmas.py: old database files warning
Oct 17, 2017
9af1378
tardis/plasma/standard_plasmas.py: old database file warning
Oct 17, 2017
80632fe
tardis/plasma/standard_plasmas.py: old database files warning
laudb Oct 25, 2017
715ee74
tardis/plasma/standard_plasmas.py: old database files warning
laudb Oct 30, 2017
432f772
tardis/plasma/standard_plasmas.py: old database files warning
laudb Oct 30, 2017
733819e
tardis/plasma/standard_plasmas.py: old database files warning
laudb Oct 31, 2017
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
10 changes: 9 additions & 1 deletion tardis/plasma/standard_plasmas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,15 @@ def assemble_plasma(config, model, atom_data=None):
raise ValueError('No atom_data option found in the configuration.')

logger.info('Reading Atomic Data from %s', atom_data_fname)
atom_data = atomic.AtomData.from_hdf(atom_data_fname)

try:
atom_data = atomic.AtomData.from_hdf(atom_data_fname)
except TypeError as e:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and no \ 😉

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, I'll have another go.. so catch the error, access the message and display it with the helpful suggestion or possible reason

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh..now I see

print (e, 'Error might be from the use of an old-format of the atomic database, \n' +\
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need the plus. every string in parenthesis is automatically concatenated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see, noted, thanks!

'please see https://github.com/tardis-sn/tardis-refdata/tree/master/atom_data' +\
',for the most recent version.')
raise


atom_data.prepare_atom_data(
model.abundance.index,
Expand Down