aboutsummaryrefslogtreecommitdiffstats
path: root/fg21sim/extragalactic
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2019-02-28 21:37:19 +0800
committerAaron LI <aly@aaronly.me>2019-02-28 21:37:19 +0800
commit0743d3ce488e48f43be3e4ba03a6d593ed7a7b49 (patch)
treeeca036967a05c2059c14a4a7ab0027d1f9d4d4d7 /fg21sim/extragalactic
parent4721943aecb8b7c7f2cf3cb726a41b5edd3e8d49 (diff)
downloadfg21sim-0743d3ce488e48f43be3e4ba03a6d593ed7a7b49.tar.bz2
clusters/main: Use pad_dict_list() to pad merger events
Diffstat (limited to 'fg21sim/extragalactic')
-rw-r--r--fg21sim/extragalactic/clusters/main.py18
1 files changed, 5 insertions, 13 deletions
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py
index e57950c..8fdefb0 100644
--- a/fg21sim/extragalactic/clusters/main.py
+++ b/fg21sim/extragalactic/clusters/main.py
@@ -29,7 +29,7 @@ from .emission import HaloEmission
from ...sky import get_sky
from ...share import CONFIGS, COSMO
from ...utils.io import dataframe_to_csv, pickle_dump, pickle_load
-from ...utils.ds import dictlist_to_dataframe
+from ...utils.ds import dictlist_to_dataframe, pad_dict_list
from ...utils.convert import JyPerPix_to_K
from ...utils.units import UnitConversions as AUC
@@ -491,18 +491,10 @@ class GalaxyClusters:
logger.info("Converting cluster catalog into a Pandas DataFrame ...")
# Pad the merger events to be same length
- nmax = max([cdict["merger_num"] for cdict in self.catalog])
- for cdict in self.catalog:
- n = len(cdict["merger_z"])
- if n == nmax:
- continue
- npad = nmax - n
- cdict.update([
- ("merger_mass1", cdict["merger_mass1"] + [None]*npad),
- ("merger_mass2", cdict["merger_mass2"] + [None]*npad),
- ("merger_z", cdict["merger_z"] + [None]*npad),
- ("merger_t", cdict["merger_t"] + [None]*npad),
- ])
+ nmax = max([d["merger_num"] for d in self.catalog])
+ padkeys = ["merger_mass1", "merger_mass2", "merger_z", "merger_t"]
+ for d in self.catalog:
+ pad_dict_list(d, padkeys, length=nmax)
keys = list(self.catalog[0].keys())
catalog_df = dictlist_to_dataframe(self.catalog, keys=keys)