aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clusters/helper.py: Add "density_energy_electron()" functionAaron LI2017-07-231-2/+27
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/main.py: Commit missing changes on CONFIGS and COSMOAaron LI2017-07-231-3/+3
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters: Accept 1D numpy array and calculate values for all gamma'sAaron LI2017-07-232-21/+27
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/halo.py: Constrain tau_acc to avoid zero diffusionAaron LI2017-07-232-2/+22
| | | | | | | | | | Zero or negative diffusion coefficient leads to unstable or wrong results due to numerical algorithm/scheme adopted to solve the Fokker-Planck equation. Also add a NOTE to the FokkerPlanckSolver class. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/helper.py: Disable scattering on scaling relationsAaron LI2017-07-231-4/+8
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* Update bin scripts to use global "CONFIGS"Aaron LI2017-07-239-60/+42
| | | | | | Also update copyright year/email and minor cleanups Signed-off-by: Aaron LI <aly@aaronly.me>
* Use all uppercase to identify the global CONFIGS and COSMOAaron LI2017-07-229-54/+50
| | | | | | Update to use the global CONFIGS and COSMO Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters: Import global "configs" to simplify parametersAaron LI2017-07-222-72/+57
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/halo.py: Implement "_injection_rate" propertyAaron LI2017-07-221-6/+56
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters: Move "magnetic_field()" function to helper.pyAaron LI2017-07-222-24/+40
| | | | | | Import the global "configs" in helper.py to make parameters lean. Signed-off-by: Aaron LI <aly@aaronly.me>
* configs/manager.py: Add formatter for handlersAaron LI2017-07-221-1/+8
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* utils/units.py: Add "mec2" energy of a still electronAaron LI2017-07-221-1/+5
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters: Rename "last major merger" to "recent major merger"Aaron LI2017-07-222-26/+25
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/halo.py: update parameters and methodsAaron LI2017-07-221-46/+119
| | | | | | Still WIP... Signed-off-by: Aaron LI <aly@aaronly.me>
* configs: Update cosmology parameters (Komatsu et al. 2011)Aaron LI2017-07-221-1/+2
| | | | | | References: Komatsu et al. 2011, ApJS, 192, 18; Tab.(1) Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/halo.py: More cleanups with minor updatesAaron LI2017-07-222-70/+98
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/halo.py: Significant cleanupsAaron LI2017-07-221-551/+2
| | | | | | | Several methods/functions have been migrated into "helper.py", while other methods/functions are obsolete. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/solver.py: Improve documents and clean upAaron LI2017-07-221-14/+49
| | | | | | | | TODO: adaptively determine the proper time step instead of using a constant one. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters: Use "GalaxyClusters" from main.pyAaron LI2017-07-221-2/+2
| | | | | | The "clusters.py" is deprecated and will be deleted later. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/helper.py: Add "velocity_impact()" and "time_crossing()"Aaron LI2017-07-221-3/+71
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/main.py: Add property "halo_configs"Aaron LI2017-07-222-28/+44
| | | | | | And update the config specification accordingly with some cleanups. Signed-off-by: Aaron LI <aly@aaronly.me>
* Update README.rst against recent changesAaron LI2017-07-221-8/+11
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* utils/cosmology.py: Add property "baryon_fraction"Aaron LI2017-07-211-0/+9
| | | | | | XXX: assumed to be independent of redshifts! Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/main.py: Add "_magnetic_field()" methodAaron LI2017-07-212-8/+40
| | | | | | Also update the configurations Signed-off-by: Aaron LI <aly@aaronly.me>
* Add clusters/helper.pyAaron LI2017-07-211-0/+158
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* Use the global "cosmo" instance for simplificationAaron LI2017-07-214-53/+34
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* README.rst: update "development" section with DEBUG infoAaron LI2017-07-211-1/+4
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* Fix parameter names about cosmologyAaron LI2017-07-212-4/+4
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* bin/fg21sim: Setup cosmology model at the beginningAaron LI2017-07-212-4/+9
| | | | | | | | * Update copyright * Add a help on "DEBUG_FG21SIM" * Also fix a bug in cosmology setup() Signed-off-by: Aaron LI <aly@aaronly.me>
* checkers.py: Drop resolution check to avoid circular importing errorAaron LI2017-07-211-7/+0
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* configs: Default to not generate products manifestAaron LI2017-07-211-2/+4
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* utils: Import Cosmology and make "cosmo" a global instanceAaron LI2017-07-211-1/+4
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* cosmology.py: Add "setup()" method to allow update parametersAaron LI2017-07-211-11/+38
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* configs/manager.py: Add property "cosmology"Aaron LI2017-07-211-0/+15
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* foregrounds.py: Do not create products manifest if not configuredAaron LI2017-07-211-6/+15
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* configs/manager.py: get_path() return None if value is an empty stringAaron LI2017-07-211-2/+5
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* Add missing requirement "reproject"Aaron LI2017-07-202-0/+3
| | | | | | Also works with Python 3.6 (basic tests at the moment) Signed-off-by: Aaron LI <aly@aaronly.me>
* README.rst: Add a "development" installation sectionAaron LI2017-07-201-2/+12
| | | | | | Also cleanup a bit on requirements and installation guide. Signed-off-by: Aaron LI <aly@aaronly.me>
* setup.py: Fix the missing directory for scriptsAaron LI2017-07-201-1/+1
| | | | | | This fixes the installation failure bug. Signed-off-by: Aaron LI <aly@aaronly.me>
* Bump version to 0.4.2 (forgot when tagging)Aaron LI2017-07-201-1/+1
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* Update email, url, and copyright yearAaron LI2017-07-201-4/+4
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/main.py: Add basic "preprocess()" methodAaron LI2017-07-201-1/+23
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/main.py: Implement "_simulate_merger()"Aaron LI2017-07-202-15/+95
| | | | | | | | | | Simulate the formation history of each cluster and identify the last/recent major merger event. Also add new configuration option "tau_merger" and tweak several configurations options. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/formation.py: show verbose info only in DEBUGAaron LI2017-07-201-6/+9
| | | | | | | | Since the ``ClusterFormation`` is repeatedly invoked in ``GalaxyClusters``, so make the verbose information printed only at DEBUG level. Signed-off-by: Aaron LI <aly@aaronly.me>
* mergertree/show_mergertree(): Improve print formatAaron LI2017-07-201-3/+3
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/formation.py: Fix bug in "last_major_merger" propertyAaron LI2017-07-201-7/+11
| | | | | | Also calculate and add the mass ratio to the event dictionary. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/formation.py: Fix bug in "_trace_main()"Aaron LI2017-07-201-4/+8
| | | | | | | | | Do not modify the root node of the merger tree, and return this root node after tracing the formation history. Also print some more information for debug. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/mergertree.py: Add function "show_mtree()"Aaron LI2017-07-191-0/+32
| | | | | | | This function traces the main cluster and print its formation history to the screen, for easier illustration and examination. Signed-off-by: Aaron LI <aly@aaronly.me>
* clusters/main.py: Add and save catalog comments for columnsAaron LI2017-07-191-6/+18
| | | | Signed-off-by: Aaron LI <aly@aaronly.me>
* dataframe_to_csv(): Add parameter "comment"Aaron LI2017-07-191-4/+17
| | | | | | Also write the writer and datetime to header by default. Signed-off-by: Aaron LI <aly@aaronly.me>
Copyright © 2017-2018 Aaron LI. All Rights Reserved.