Refactor spectrum #729
Merged
Refactor spectrum #729
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
The refactor changes the way a spectrum is handled. Instead of creating a spectrum and updating it after each montecarlo iteration, we create a new spectrum from the MontecarloRunner whenever it is needed. Benefits: - TARDISSpectrum is now a general purpose spectrum class that is not linked to the Iteration sheme anymore. - It is now possible to save spectra for all iterations without them being updated each iteration. - This class can now also be used for spectra created by the formal integral approach (upcoming PR tardis-sn#726)
8 tasks
|
@yeganer add function to calculate flux using distance. |
|
@yeganer add deprecation warning to flux |
wkerzendorf
reviewed
Jun 6, 2017
tardis/montecarlo/base.py
Outdated
| @@ -37,14 +37,11 @@ def __init__(self, seed, spectrum_frequency, virtual_spectrum_range, | |||
| self.packet_source = packet_source.BlackBodySimpleSource(seed) | |||
| self.spectrum_frequency = spectrum_frequency | |||
| self.virtual_spectrum_range = virtual_spectrum_range | |||
| self.distance = distance | |||
tardis/montecarlo/base.py
Outdated
| self.spectrum_reabsorbed.update_luminosity( | ||
| montecarlo_reabsorbed_luminosity) | ||
| @property | ||
| def spectrum_virtual(self): |
tardis/montecarlo/base.py
Outdated
| return TARDISSpectrum( | ||
| self.spectrum_frequency, | ||
| self.montecarlo_virtual_luminosity, | ||
| self.distance) |
tardis/montecarlo/spectrum.py
Outdated
| HDF_PROPERTIES = [ | ||
| '_frequency', | ||
| 'luminosity', | ||
| 'distance' |
This concludes the refactoring of TARDISSpectrum. The syntax for the dummy to_hdf was slightly changed to match the syntax of pandas to_hdf() methods. That means the 'name' parameter was removed as there is no reason for the function do decide where it should save to and the path is now a required argument.
yeganer
force-pushed
the
refactor_spectrum
branch
from
4297d48 to
ae46cc3
Compare
talytha
approved these changes
Jun 6, 2017
|
@wkerzendorf Do we still want a |
|
@yeganer the flux should get a deprecation warning. |
chvogl
approved these changes
Jun 6, 2017
| spec_from) | ||
|
|
||
|
|
||
| def test_creat_from_wl(spectrum): |
There was a problem hiding this comment.
You could maybe move this test into a separate section, since it does not belong into the "Load and Save" category.
There was a problem hiding this comment.
Good point, I added another section.
yeganer
force-pushed
the
refactor_spectrum
branch
from
aaa85b6 to
c3b1a69
Compare
yeganer
force-pushed
the
refactor_spectrum
branch
from
c3b1a69 to
4f0e7b5
Compare
|
@tardis-sn/tardis-core I'm done with this PR, if there are no further comments, this can be merged. |
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.
The refactor changes the way a spectrum is handled. Instead of creating
a spectrum and updating it after each montecarlo iteration, we create a
new spectrum from the MontecarloRunner whenever it is needed.
Benefits:
linked to the Iteration sheme anymore.
being updated each iteration.
integral approach (upcoming PR [WIP] Basic implementation of the formal integral #726)