aboutsummaryrefslogtreecommitdiffstats
path: root/fg21sim
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2017-07-31 19:48:43 +0800
committerAaron LI <aly@aaronly.me>2017-07-31 19:48:43 +0800
commit38ab63fc5191a4893f6f46d9b8b40ae988f66c88 (patch)
tree623ef7dc722d12e8ed54da6a27508f0448149542 /fg21sim
parent7f3086c7bfcf8e0be531c6885276e3dcdf88f83f (diff)
downloadfg21sim-38ab63fc5191a4893f6f46d9b8b40ae988f66c88.tar.bz2
Add `fg21sim.share` module to hold globally shared "CONFIGS" & "COSMO"
Signed-off-by: Aaron LI <aly@aaronly.me>
Diffstat (limited to 'fg21sim')
-rw-r--r--fg21sim/configs/__init__.py2
-rw-r--r--fg21sim/extragalactic/clusters/formation.py2
-rw-r--r--fg21sim/extragalactic/clusters/halo.py3
-rw-r--r--fg21sim/extragalactic/clusters/helper.py3
-rw-r--r--fg21sim/extragalactic/clusters/main.py3
-rw-r--r--fg21sim/utils/__init__.py2
-rw-r--r--fg21sim/utils/cosmology.py2
7 files changed, 5 insertions, 12 deletions
diff --git a/fg21sim/configs/__init__.py b/fg21sim/configs/__init__.py
index 7670c90..d06c12b 100644
--- a/fg21sim/configs/__init__.py
+++ b/fg21sim/configs/__init__.py
@@ -3,5 +3,3 @@
from .manager import ConfigManager
from .checkers import check_configs
-
-CONFIGS = ConfigManager()
diff --git a/fg21sim/extragalactic/clusters/formation.py b/fg21sim/extragalactic/clusters/formation.py
index a9c9acc..dc41e00 100644
--- a/fg21sim/extragalactic/clusters/formation.py
+++ b/fg21sim/extragalactic/clusters/formation.py
@@ -24,7 +24,7 @@ import scipy.special
import scipy.optimize
from .mergertree import MergerTree
-from ...utils import COSMO
+from ...share import COSMO
logger = logging.getLogger(__name__)
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index 7230a81..333da4e 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -45,8 +45,7 @@ import numpy as np
from . import helper
from .solver import FokkerPlanckSolver
from .emission import SynchrotronEmission
-from ...configs import CONFIGS
-from ...utils import COSMO
+from ...share import CONFIGS, COSMO
from ...utils.units import (Units as AU,
UnitConversions as AUC)
from ...utils.convert import Fnu_to_Tb_fast
diff --git a/fg21sim/extragalactic/clusters/helper.py b/fg21sim/extragalactic/clusters/helper.py
index 1367374..0d66dee 100644
--- a/fg21sim/extragalactic/clusters/helper.py
+++ b/fg21sim/extragalactic/clusters/helper.py
@@ -31,8 +31,7 @@ References
import numpy as np
from scipy import integrate
-from ...configs import CONFIGS
-from ...utils import COSMO
+from ...share import CONFIGS, COSMO
from ...utils.units import (Units as AU,
Constants as AC,
UnitConversions as AUC)
diff --git a/fg21sim/extragalactic/clusters/main.py b/fg21sim/extragalactic/clusters/main.py
index a280bb9..c3e4068 100644
--- a/fg21sim/extragalactic/clusters/main.py
+++ b/fg21sim/extragalactic/clusters/main.py
@@ -24,8 +24,7 @@ import pandas as pd
from .formation import ClusterFormation
from .halo import RadioHalo
-from ...configs import CONFIGS
-from ...utils import COSMO
+from ...share import CONFIGS, COSMO
from ...utils.io import dataframe_to_csv
from ...sky import get_sky
diff --git a/fg21sim/utils/__init__.py b/fg21sim/utils/__init__.py
index 5b61027..2f9f57f 100644
--- a/fg21sim/utils/__init__.py
+++ b/fg21sim/utils/__init__.py
@@ -3,5 +3,3 @@
from .logging import setup_logging
from .cosmology import Cosmology
-
-COSMO = Cosmology()
diff --git a/fg21sim/utils/cosmology.py b/fg21sim/utils/cosmology.py
index 23a5e1f..dc5f126 100644
--- a/fg21sim/utils/cosmology.py
+++ b/fg21sim/utils/cosmology.py
@@ -40,7 +40,7 @@ import numpy as np
from scipy import integrate
from astropy.cosmology import FlatLambdaCDM
-from ..configs import CONFIGS
+from ..share import CONFIGS
from .units import (UnitConversions as AUC, Constants as AC)