Emissivity compiling and loading.#62
Merged
maxbriel merged 74 commits intoHeloiseS:dev1.6from Oct 6, 2020
Merged
Conversation
The complex stellar population subpackage is meant to combine bpass variables with a stelalr formation history to generate more complex populations. To this end, we're implementing a stellar formation history class. The basic SFH class for custom SFH is implemented using scipy splines. This basic class is also tested.
This method allows for the calculation of the event rate at a given lookback time. It uses the BPASS binning for this. This method is much faster, but suffers from a lack of accuracy.
Both functions are implemented for the BPASS spectra. However, the method is similar to the BPASS event rate calculation, which is sub optimal for the spectra calculation. It takes an extremely long time to do the calculation. A for loop of 100000 iterations is present, because each wavelength is seen as it's own "event type". It should be possible to remove this by implementing a function to take the separate wavelengths as a single unit. It would be interesting so see the influence of putting the for loop within a numba function, but thinking about restructuring the function is probably better. Including a "caching" of the BPASS spectra into a pickled DataFrame. Additional test files are required for this to run.
Instead of requiring a scipy interpolated spline as input. These functions now take a list of functions as input for the stellar formation and metallicity history. This adjustment has been made by using `numpy.interp` instead of scipy.interpolate. Furthermore, instead of scipy's spline integration `numpy.trapz` is now used to calculate the mass per bin.
Small bugfix in `all_spectra` The binary `kwarg` was not passed on to `SpectraCompiler` from `load.all_spectra`.
mass_per_bin now takes a normal python callable and a vectorized function as input. The latter boosts performance significantly
- CSPEventRate functions are now called:
- calculate_rate_over_time -> over_time
- calculate_rate_at_time -> at_time
new functions:
- grid_over_time: calculates the rates from a 2D SFH (per BPASS metallicity) from time_points to time bins
- grid_at_time: calculate the event rate at a specific moment in lookback time from a 2D SFH grid
* BUG: use np instead of pd in SpectraCompiler. * BUG: fix index and make test pass. * BUG: fix another regression bug. * Fix further regression bug. Authored-by: Martin Glatzle <mglatzle@mpa-garching.mpg.de>
Also includes some docstring updates
CSPSpectra now has the following functions: Public: - at_time: at time with function input - over_time: over lb time with function input - grid_at_time: at time with SFH grid input - grid_over_time: over lb time with SFH grid input Private: - grid_rate_calculator_at_time - grid_rate_calculator_over_time The grid_rate_calculators_* are numba functions that have the grid_* around them as wrappers for the input and output
Contributor
Author
|
@maxbriel could you please check if the changes proposed here are ok for you? I think they only affect code you "own". |
Collaborator
|
Hi Martin, Thank you for your contribution! Love the abstraction and inheritance! Currently, I am rather busy, but will check the proposed changes fully before the end of next week! |
Try/except has been replace by a if/else with a file check.
Collaborator
|
Hi Martin, I finally got around to inspecting the changes. Thank you for also cleaning up some of the doc strings! To keep consistency, we're merging For this I have merged
When the tests pass, it will be merged into |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 pre-requisite for the completion of #46. It does for the emissivities what is already there for the spectra in terms of compilation to
npyfiles and loading.