-
Notifications
You must be signed in to change notification settings - Fork 8
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.
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
Emissivity compiling and loading. #62
Commits on Jun 2, 2020
-
Created CSP archistecture and basic sfh class
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.
Configuration menu - View commit details
-
Copy full SHA for 4100544 - Browse repository at this point
Copy the full SHA 4100544View commit details
Commits on Jun 5, 2020
-
Configuration menu - View commit details
-
Copy full SHA for f2d0f86 - Browse repository at this point
Copy the full SHA f2d0f86View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6828272 - Browse repository at this point
Copy the full SHA 6828272View commit details -
Configuration menu - View commit details
-
Copy full SHA for d3cc2a5 - Browse repository at this point
Copy the full SHA d3cc2a5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 29a8d1e - Browse repository at this point
Copy the full SHA 29a8d1eView commit details
Commits on Jun 9, 2020
-
Adds
at_time
function to the event rate classThis 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.
Configuration menu - View commit details
-
Copy full SHA for 95c6cb0 - Browse repository at this point
Copy the full SHA 95c6cb0View commit details
Commits on Jun 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 536b6b9 - Browse repository at this point
Copy the full SHA 536b6b9View commit details
Commits on Jun 11, 2020
-
Implements calculate spectrum at_time and over_time functions
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.
Configuration menu - View commit details
-
Copy full SHA for 9e95635 - Browse repository at this point
Copy the full SHA 9e95635View commit details -
Configuration menu - View commit details
-
Copy full SHA for f22c615 - Browse repository at this point
Copy the full SHA f22c615View commit details
Commits on Jun 16, 2020
-
Configuration menu - View commit details
-
Copy full SHA for e1bf600 - Browse repository at this point
Copy the full SHA e1bf600View commit details -
Configuration menu - View commit details
-
Copy full SHA for 070282b - Browse repository at this point
Copy the full SHA 070282bView commit details -
Configuration menu - View commit details
-
Copy full SHA for a881b36 - Browse repository at this point
Copy the full SHA a881b36View commit details -
Configuration menu - View commit details
-
Copy full SHA for dfb88cb - Browse repository at this point
Copy the full SHA dfb88cbView commit details
Commits on Jun 18, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 9d4d49d - Browse repository at this point
Copy the full SHA 9d4d49dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5c1fb9a - Browse repository at this point
Copy the full SHA 5c1fb9aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 276c1de - Browse repository at this point
Copy the full SHA 276c1deView commit details -
Configuration menu - View commit details
-
Copy full SHA for d2f93d9 - Browse repository at this point
Copy the full SHA d2f93d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 71f3604 - Browse repository at this point
Copy the full SHA 71f3604View commit details -
Configuration menu - View commit details
-
Copy full SHA for 36bd68b - Browse repository at this point
Copy the full SHA 36bd68bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6475bbd - Browse repository at this point
Copy the full SHA 6475bbdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 760144d - Browse repository at this point
Copy the full SHA 760144dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 551b8e7 - Browse repository at this point
Copy the full SHA 551b8e7View commit details
Commits on Jun 19, 2020
-
Adjust eventrate functions to take lists of functions
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.
Configuration menu - View commit details
-
Copy full SHA for 14d7f4b - Browse repository at this point
Copy the full SHA 14d7f4bView commit details
Commits on Jun 21, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 810f560 - Browse repository at this point
Copy the full SHA 810f560View commit details -
Configuration menu - View commit details
-
Copy full SHA for 41f4f9a - Browse repository at this point
Copy the full SHA 41f4f9aView commit details -
Configuration menu - View commit details
-
Copy full SHA for cb1f7b8 - Browse repository at this point
Copy the full SHA cb1f7b8View commit details
Commits on Jun 22, 2020
-
Configuration menu - View commit details
-
Copy full SHA for ee720e2 - Browse repository at this point
Copy the full SHA ee720e2View commit details -
Configuration menu - View commit details
-
Copy full SHA for fa26ff5 - Browse repository at this point
Copy the full SHA fa26ff5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 02f820a - Browse repository at this point
Copy the full SHA 02f820aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 23893b5 - Browse repository at this point
Copy the full SHA 23893b5View commit details
Commits on Jun 23, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 666b351 - Browse repository at this point
Copy the full SHA 666b351View commit details
Commits on Jun 24, 2020
-
- Adds BPASS IMFS to the constants - Adds check to BPASS IMFS - Adds test for `data_compiler.SpectraData` - Reduces data usage for rate tests
Configuration menu - View commit details
-
Copy full SHA for 4bc4c20 - Browse repository at this point
Copy the full SHA 4bc4c20View commit details
Commits on Jun 26, 2020
-
Uses `unittest.mock` to allow for a smaller DataFrame to be used.
Configuration menu - View commit details
-
Copy full SHA for 224af19 - Browse repository at this point
Copy the full SHA 224af19View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9520ebd - Browse repository at this point
Copy the full SHA 9520ebdView commit details
Commits on Jun 30, 2020
-
The compiler now outputs the BPASS spectra as a 3D `numpy.ndarray` this minimises storage and allows for faster and less memory hungry operations than the MultiIndex pandas DataFrame. The tests are updated accordingly and using unittest.mock a single spectra file is use. (This could be simulated too)
Configuration menu - View commit details
-
Copy full SHA for 9e0c487 - Browse repository at this point
Copy the full SHA 9e0c487View commit details -
Documentation update + SFH input
The documentation now shows the size and shape of each input and output variable. The `_over_time` and `_at_time` for `CSPSpectra` and `CSPEventRate` are now able to take the `SFH` object as an input.
Configuration menu - View commit details
-
Copy full SHA for 81ba83f - Browse repository at this point
Copy the full SHA 81ba83fView commit details -
Removed CSP from utils due to cyclical import
The CSP class in `utils` was importing the SFH class, which was importing the `utils` module. Therefore, failing importing. Thus, the CSP class has been moved to a separate file
Configuration menu - View commit details
-
Copy full SHA for cbd3a89 - Browse repository at this point
Copy the full SHA cbd3a89View commit details
Commits on Jul 1, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2b08f82 - Browse repository at this point
Copy the full SHA 2b08f82View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1a81f7d - Browse repository at this point
Copy the full SHA 1a81f7dView commit details
Commits on Jul 8, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 1dad9b4 - Browse repository at this point
Copy the full SHA 1dad9b4View commit details
Commits on Jul 10, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 9a7429f - Browse repository at this point
Copy the full SHA 9a7429fView commit details
Commits on Jul 16, 2020
-
at_time new default sample rate + load functions moved to hoki.load
at_time now uses 1000 as the default sample rate. The BPASS bins can still be used is a negative number is given. The `load_spectra` and `load_rates` have been moved to `hoki.load` and renamed to `all_spectra` and `all_rates`, respectively. tests have been adjusted accordingly
Configuration menu - View commit details
-
Copy full SHA for 1d22aef - Browse repository at this point
Copy the full SHA 1d22aefView commit details -
Configuration menu - View commit details
-
Copy full SHA for 67cc7c7 - Browse repository at this point
Copy the full SHA 67cc7c7View commit details -
Configuration menu - View commit details
-
Copy full SHA for cd64e00 - Browse repository at this point
Copy the full SHA cd64e00View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2a41a9a - Browse repository at this point
Copy the full SHA 2a41a9aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7085eb4 - Browse repository at this point
Copy the full SHA 7085eb4View commit details -
Configuration menu - View commit details
-
Copy full SHA for dca1a03 - Browse repository at this point
Copy the full SHA dca1a03View commit details
Commits on Jul 31, 2020
-
private optimised mass_per_time_bin calculation
Implements 2 new functions: - A custom numba trapezoidal function - A optimised mass_per_bin function for non-function-based data
Configuration menu - View commit details
-
Copy full SHA for ece0273 - Browse repository at this point
Copy the full SHA ece0273View commit details -
Refactored Event Rate calculation from array data
The original event rate calculation took functions as in input. This becomes cumbersome when you have data at specific time values. This calculation is done by taking a 2D matrix with time points on one axis and BPASS metallicities on the other. The values of the matrix describes the SFR at that moment in time. The calculate_rate_over_time function has been adjusted to use this new function.
Configuration menu - View commit details
-
Copy full SHA for bccb99f - Browse repository at this point
Copy the full SHA bccb99fView commit details -
Configuration menu - View commit details
-
Copy full SHA for bed60cf - Browse repository at this point
Copy the full SHA bed60cfView commit details
Commits on Aug 25, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 285c508 - Browse repository at this point
Copy the full SHA 285c508View commit details -
Configuration menu - View commit details
-
Copy full SHA for a8d6d72 - Browse repository at this point
Copy the full SHA a8d6d72View commit details
Commits on Aug 26, 2020
-
Merge pull request HeloiseS#58 from findesgh/csp
Small bugfix in `all_spectra` The binary `kwarg` was not passed on to `SpectraCompiler` from `load.all_spectra`.
Configuration menu - View commit details
-
Copy full SHA for 94b8534 - Browse repository at this point
Copy the full SHA 94b8534View commit details
Commits on Aug 27, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 31031b9 - Browse repository at this point
Copy the full SHA 31031b9View commit details
Commits on Aug 28, 2020
-
BUG: use np instead of pd in SpectraCompiler.
Martin Glatzle committedAug 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 6bc3f73 - Browse repository at this point
Copy the full SHA 6bc3f73View commit details -
BUG: fix index and make test pass.
Martin Glatzle committedAug 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 7a54cdf - Browse repository at this point
Copy the full SHA 7a54cdfView commit details -
BUG: fix another regression bug.
Martin Glatzle committedAug 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 1e9556e - Browse repository at this point
Copy the full SHA 1e9556eView commit details -
Merge branch 'csp' of https://github.com/HeloiseS/hoki into csp_fix2
Martin Glatzle committedAug 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 0edb23e - Browse repository at this point
Copy the full SHA 0edb23eView commit details -
Martin Glatzle committed
Aug 28, 2020 Configuration menu - View commit details
-
Copy full SHA for 4ec8dab - Browse repository at this point
Copy the full SHA 4ec8dabView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a2e307 - Browse repository at this point
Copy the full SHA 0a2e307View commit details -
Updates mass per bin calculation for vectorized funciton input
mass_per_bin now takes a normal python callable and a vectorized function as input. The latter boosts performance significantly
Configuration menu - View commit details
-
Copy full SHA for bdba1cb - Browse repository at this point
Copy the full SHA bdba1cbView commit details -
Renames CSPEventRate functions and adds grid functions
- 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
Configuration menu - View commit details
-
Copy full SHA for be7b9fa - Browse repository at this point
Copy the full SHA be7b9faView commit details -
Configuration menu - View commit details
-
Copy full SHA for f9a5a10 - Browse repository at this point
Copy the full SHA f9a5a10View commit details -
Merge pull request HeloiseS#60 from findesgh/csp_fix2
* 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>
Configuration menu - View commit details
-
Copy full SHA for 30485f5 - Browse repository at this point
Copy the full SHA 30485f5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c74851 - Browse repository at this point
Copy the full SHA 0c74851View commit details
Commits on Aug 29, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 498a3ed - Browse repository at this point
Copy the full SHA 498a3edView commit details -
Set default sample rate for at_time
Also includes some docstring updates
Configuration menu - View commit details
-
Copy full SHA for ad2bc98 - Browse repository at this point
Copy the full SHA ad2bc98View commit details -
Configuration menu - View commit details
-
Copy full SHA for f727fd7 - Browse repository at this point
Copy the full SHA f727fd7View commit details -
Adds grid functions for the spectra calculation
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
Configuration menu - View commit details
-
Copy full SHA for 466efab - Browse repository at this point
Copy the full SHA 466efabView commit details
Commits on Sep 2, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 6e81cc0 - Browse repository at this point
Copy the full SHA 6e81cc0View commit details
Commits on Sep 9, 2020
-
Emissivity compiling and loading.
Martin Glatzle committedSep 9, 2020 Configuration menu - View commit details
-
Copy full SHA for 2a6c95f - Browse repository at this point
Copy the full SHA 2a6c95fView commit details
Commits on Oct 5, 2020
-
Rename func, add existence of metallicity files, remove try/except
Try/except has been replace by a if/else with a file check.
Configuration menu - View commit details
-
Copy full SHA for 6c883e1 - Browse repository at this point
Copy the full SHA 6c883e1View commit details
Commits on Oct 6, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 0c8e094 - Browse repository at this point
Copy the full SHA 0c8e094View commit details -
Configuration menu - View commit details
-
Copy full SHA for a1187cd - Browse repository at this point
Copy the full SHA a1187cdView commit details