From 34098c6a8b1008f4950e8524936406b6611d74f9 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Tue, 2 Jan 2018 13:35:34 +0800 Subject: clusters: rework the reuse of previously dumped cluster catalog --- fg21sim/configs/20-extragalactic.conf.spec | 17 ++++++++++++----- fg21sim/configs/checkers.py | 5 +++-- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'fg21sim/configs') diff --git a/fg21sim/configs/20-extragalactic.conf.spec b/fg21sim/configs/20-extragalactic.conf.spec index a75907c..02d7f00 100644 --- a/fg21sim/configs/20-extragalactic.conf.spec +++ b/fg21sim/configs/20-extragalactic.conf.spec @@ -60,12 +60,19 @@ # used by the following ``[[halos]]`` section. # [[clusters]] - # Output CSV file of the clusters catalog containing the simulated - # mass, redshift, position, shape, and the recent major merger info. + # Output CSV file of the cluster catalog containing the simulated + # mass, redshift, position, shape, recent merger info, etc. catalog_outfile = string(default=None) - # Whether to directly use the (previously simulated) catalog file - # specified as the above "catalog_outfile" option? + # Whether to dump the raw data of the simulated cluster catalog in + # Python native pickle format (i.e., ".pkl") to a file with the same + # basename as the above ``catalog_outfile``? + # The dumped data can be easily loaded back for reuse. + dump_catalog_data = boolean(default=True) + + # Whether to directly use the (previously simulated) catalog data as + # specified by the above "catalog_outfile" and ``dump_catalog_data`` + # options? # NOTE: # By using an existing catalog, the steps to derive these data are # simply skipped. @@ -76,7 +83,7 @@ # tests and only create images at some frequencies necessary for # testing, then select the satisfying one to continue the simulation # to generate images at all frequencies. - use_output_catalog = boolean(default=False) + use_dump_catalog_data = boolean(default=False) # Output CSV file of the halos catalog containing the calculated # properties of the simulated halos. diff --git a/fg21sim/configs/checkers.py b/fg21sim/configs/checkers.py index 78d5b20..9759ef1 100644 --- a/fg21sim/configs/checkers.py +++ b/fg21sim/configs/checkers.py @@ -197,8 +197,9 @@ def check_extragalactic_clusters(configs): key = "extragalactic/psformalism/dndlnm_outfile" results.update(_check_missing(configs, key)) # catalog required when enabled to use it - if configs.get(comp+"/use_output_catalog"): - results.update(_check_existence(configs, comp+"/catalog_outfile")) + if configs.get(comp+"/use_dump_catalog_data"): + results.update(_check_file_existence( + configs, comp+"/catalog_outfile", ext=".pkl")) else: results.update(_check_missing(configs, comp+"/catalog_outfile")) # dumped halos data required when enabled to use it -- cgit v1.2.2