aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2017-08-26 11:17:08 +0800
committerAaron LI <aly@aaronly.me>2017-08-26 11:17:08 +0800
commit2760364f39688437437beb94215e3690ecc1c02a (patch)
treedf8e9b93f63b0511771d8d4ba05051ffca755d94
parentf6f7ce980797187aed031ae7979be2bf17f82429 (diff)
downloadfg21sim-2760364f39688437437beb94215e3690ecc1c02a.tar.bz2
configs: Remove option "save"; all enabled components will be saved
-rw-r--r--fg21sim/configs/10-galactic.conf.spec6
-rw-r--r--fg21sim/configs/20-extragalactic.conf.spec4
-rw-r--r--fg21sim/configs/checkers.py12
-rw-r--r--fg21sim/extragalactic/clusters/main.py1
-rw-r--r--fg21sim/galactic/synchrotron.py1
5 files changed, 4 insertions, 20 deletions
diff --git a/fg21sim/configs/10-galactic.conf.spec b/fg21sim/configs/10-galactic.conf.spec
index 116586f..8d3ee77 100644
--- a/fg21sim/configs/10-galactic.conf.spec
+++ b/fg21sim/configs/10-galactic.conf.spec
@@ -45,8 +45,6 @@
# Filename prefix for this component
prefix = string(default="gsync")
- # Whether save this component to disk
- save = boolean(default=True)
# Output directory to save the simulated results
output_dir = string(default=None)
@@ -81,8 +79,6 @@
# Filename prefix for this component
prefix = string(default="gfree")
- # Whether save this component to disk
- save = boolean(default=True)
# Output directory to save the simulated results
output_dir = string(default=None)
@@ -100,7 +96,5 @@
# Filename prefix for this component
prefix = string(default="gsnr")
- # Whether save this component to disk
- save = boolean(default=True)
# Output directory to save the simulated results
output_dir = string(default=None)
diff --git a/fg21sim/configs/20-extragalactic.conf.spec b/fg21sim/configs/20-extragalactic.conf.spec
index c3e27bc..4ed01ee 100644
--- a/fg21sim/configs/20-extragalactic.conf.spec
+++ b/fg21sim/configs/20-extragalactic.conf.spec
@@ -65,8 +65,6 @@
# Filename prefix for this component
prefix = string(default="cluster")
- # Whether save this component to disk
- save = boolean(default=True)
# Output directory to save the simulated results
output_dir = string(default=None)
@@ -106,8 +104,6 @@
# Extragalactic point sources
[[pointsources]]
- # Whether save this point source catelogue to disk
- save = boolean(default=True)
# Output directory to save the simulated catalog
output_dir = string(default="PS_tables")
# PS components to be simulated
diff --git a/fg21sim/configs/checkers.py b/fg21sim/configs/checkers.py
index 698311d..92751bf 100644
--- a/fg21sim/configs/checkers.py
+++ b/fg21sim/configs/checkers.py
@@ -118,8 +118,7 @@ def check_galactic_synchrotron(configs):
results[key] = "not greater than 'lmin'"
else:
results.update(res)
- if configs.getn(comp+"/save"):
- results.update(_check_missing(configs, comp+"/output_dir"))
+ results.update(_check_missing(configs, comp+"/output_dir"))
return results
@@ -137,8 +136,7 @@ def check_galactic_freefree(configs):
results.update(
_check_existence(configs, [comp+"/halphamap", comp+"/dustmap"])
)
- if configs.getn(comp+"/save"):
- results.update(_check_missing(configs, comp+"/output_dir"))
+ results.update(_check_missing(configs, comp+"/output_dir"))
return results
@@ -152,8 +150,7 @@ def check_galactic_snr(configs):
results.update(
_check_existence(configs, comp+"/catalog")
)
- if configs.getn(comp+"/save"):
- results.update(_check_missing(configs, comp+"/output_dir"))
+ results.update(_check_missing(configs, comp+"/output_dir"))
return results
@@ -169,8 +166,7 @@ def check_extragalactic_clusters(configs):
results.update(
_check_existence(configs, comp+"/catalog")
)
- if configs.getn(comp+"/save"):
- results.update(_check_missing(configs, comp+"/output_dir"))
+ results.update(_check_missing(configs, comp+"/output_dir"))
return results
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py
index b94c223..0445100 100644
--- a/fg21sim/extragalactic/clusters/main.py
+++ b/fg21sim/extragalactic/clusters/main.py
@@ -80,7 +80,6 @@ class GalaxyClusters:
self.catalog_outfile = self.configs.get_path(comp+"/catalog_outfile")
self.halos_dumpfile = self.configs.get_path(comp+"/halos_dumpfile")
self.prefix = self.configs.getn(comp+"/prefix")
- self.save = self.configs.getn(comp+"/save")
self.output_dir = self.configs.get_path(comp+"/output_dir")
self.merger_mass_min = self.configs.getn(comp+"/merger_mass_min")
self.ratio_major = self.configs.getn(comp+"/ratio_major")
diff --git a/fg21sim/galactic/synchrotron.py b/fg21sim/galactic/synchrotron.py
index 9f89217..0f89a99 100644
--- a/fg21sim/galactic/synchrotron.py
+++ b/fg21sim/galactic/synchrotron.py
@@ -59,7 +59,6 @@ class Synchrotron:
self.lmin = self.configs.getn(comp+"/lmin")
self.lmax = self.configs.getn(comp+"/lmax")
self.prefix = self.configs.getn(comp+"/prefix")
- self.save = self.configs.getn(comp+"/save")
self.output_dir = self.configs.get_path(comp+"/output_dir")
# output
self.filename_pattern = self.configs.getn("output/filename_pattern")