Rebase PR #678 #724
Merged
Rebase PR #678 #724
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
unoebauer
reviewed
May 17, 2017
tardis/montecarlo/montecarlo.pyx
Outdated
| @@ -11,12 +11,14 @@ from numpy cimport PyArray_DATA | |||
| from astropy import constants | |||
| from astropy import units | |||
| from libc.stdlib cimport free | |||
| from tardis.util import intensity_black_body | |||
|
You found the one line that I failed to clean up, good job!
Ulrich Noebauer <notifications@github.com> schrieb am Mi., 17. Mai 2017 um
14:40 Uhr:
… ***@***.**** commented on this pull request.
Looks good overall, apart from my question about the import.
------------------------------
In tardis/montecarlo/montecarlo.pyx
<#724 (comment)>:
> @@ -11,12 +11,14 @@ from numpy cimport PyArray_DATA
from astropy import constants
from astropy import units
from libc.stdlib cimport free
+from tardis.util import intensity_black_body
Is this needed?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#724 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AF4OjqsvFTrQg82LeoqBhAisulhexQe-ks5r6uq-gaJpZM4Ndx4U>
.
|
added 2 commits
May 17, 2017 14:52
Agregate all the changes needed to calculate the source function for implementing the formal integral by Lucy 1999. The changes were implemented as part of the 'Summer of Code in Space' project.
This implements a cleaned up version of the formal source function integration originally written by Tobychev. This version doesn't run by default and must be called manually. A configuration option is expected to be added later.
unoebauer
approved these changes
May 17, 2017
talytha
reviewed
May 19, 2017
tardis/simulation/base.py
Outdated
| """ | ||
| Calculates the source function using the line absorption rate estimator `Edotlu_estimator` | ||
|
|
||
| Formally it calculates the expresion ( 1 - exp(-tau_ul) ) S_ul but this product is what we need later, |
unoebauer
approved these changes
May 19, 2017
wkerzendorf
reviewed
May 19, 2017
| r_shells[1:,0],r_shells[0,0] = self.runner.r_inner_cgs[::-1] / R_max, 1.0 | ||
| z_crossings = np.sqrt(r_shells**2 - ps**2) | ||
|
|
||
| z_ct = z_crossings/ct |
There was a problem hiding this comment.
I can fix all PEP8 violations introduced by this PR or I could work on the proper version which removes 80% of the code introduced by this PR anyway.
I'm perfectly fine fixing PEP8 but I don't think we gain much for the time this takes.
talytha
approved these changes
May 19, 2017
|
@yeganer sounds good. merging |
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.
This is a rebase onto the current master of #678.