diff options
| author | Aaron LI <aly@aaronly.me> | 2017-07-22 23:53:20 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2017-07-22 23:53:20 +0800 |
| commit | 4476a0ca0e22d6a35bb07da87956d21ec7c49074 (patch) | |
| tree | 8bbbc491e34956c77d8a1b2f3e38c868fd4e3677 /fg21sim/extragalactic/clusters/main.py | |
| parent | fd5ae04bce31a4cb82dea8532028b6df92b3d476 (diff) | |
| download | fg21sim-4476a0ca0e22d6a35bb07da87956d21ec7c49074.tar.bz2 | |
Use all uppercase to identify the global CONFIGS and COSMO
Update to use the global CONFIGS and COSMO
Signed-off-by: Aaron LI <aly@aaronly.me>
Diffstat (limited to 'fg21sim/extragalactic/clusters/main.py')
| -rw-r--r-- | fg21sim/extragalactic/clusters/main.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py index 7d8d494..daa1c83 100644 --- a/fg21sim/extragalactic/clusters/main.py +++ b/fg21sim/extragalactic/clusters/main.py @@ -58,7 +58,7 @@ class GalaxyClusters: # Component name name = "galaxy clusters (halos)" - def __init__(self, configs=configs): + def __init__(self, configs=CONFIGS): self.configs = configs self.sky = get_sky(configs) self._set_configs() @@ -196,8 +196,8 @@ class GalaxyClusters: if ii % 50 == 0: logger.info("[%d/%d] %.1f%% ..." % (ii, num, 100*ii/num)) z0, M0 = row.z, row.mass - age0 = cosmo.age(z0) - zmax = cosmo.redshift(age0 - self.tau_merger) + age0 = COSMO.age(z0) + zmax = COSMO.redshift(age0 - self.tau_merger) clform = ClusterFormation(M0=M0, z0=z0, zmax=zmax, ratio_major=self.ratio_major, merger_mass_min=self.merger_mass_min) |