Extend formal integral to line_interaction_type macroatom #856
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wkerzendorf
reviewed
Jul 31, 2018
tardis/montecarlo/formal_integral.py
Outdated
| no_shells = len(model.w) | ||
|
|
||
| if runner.line_interaction_type == 'macroatom': | ||
| ma_int_data = macro_data.query('transition_type >=0') |
tardis/montecarlo/formal_integral.py
Outdated
|
|
||
| if runner.line_interaction_type == 'macroatom': | ||
| ma_int_data = macro_data.query('transition_type >=0') | ||
| internal_jump_mask = (macro_data.transition_type >= 0).values |
There was a problem hiding this comment.
why do you use both the mask and the query
tardis/montecarlo/formal_integral.py
Outdated
| ma_int_data['atomic_number'].values, | ||
| ma_int_data['ion_number'].values, | ||
| ma_int_data['source_level_number'].values] | ||
| ) |
There was a problem hiding this comment.
that exists already in the atomic_data.macro_atom_data. it is called source_level_idx and destination_level_idx (I think the first one might not exits - but we should but it there).
tardis/montecarlo/formal_integral.py
Outdated
| columns=np.arange(no_shells), index=macro_ref.index | ||
| ) | ||
| q_indices = (source_level_idx, destination_level_idx) | ||
| for shell in range(no_shells): |
|
This looks very good. I'm merging |
|
@chvogl there is a comment in atomic about destination_level_idx which should be called reference_idx. Any opinion on that? |
|
@wkerzendorf In my opinion we can remove this comment. |
|
let's do that. it just causes additional confusion. I can make a PR. I also want to log to stdout instead of err - for ease of use in jupyter notebooks and will combine the PRs |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.