aboutsummaryrefslogtreecommitdiffstats
path: root/fg21sim
diff options
context:
space:
mode:
authorAaron LI <aaronly.me@outlook.com>2017-05-27 18:11:00 +0800
committerAaron LI <aly@aaronly.me>2017-06-01 16:33:40 +0800
commitc630afcff2a8529232dee68a3964e52cf8f080b4 (patch)
treeaf5163d51c89a03084df6decbf33d7e5847d0a24 /fg21sim
parentc7e866bb8474c0b391ebb29826361c75240e5cd3 (diff)
downloadfg21sim-c630afcff2a8529232dee68a3964e52cf8f080b4.tar.bz2
clusters: Move units.py and cosmology.py to utils
Diffstat (limited to 'fg21sim')
-rw-r--r--fg21sim/extragalactic/clusters/emission.py2
-rw-r--r--fg21sim/extragalactic/clusters/formation.py2
-rw-r--r--fg21sim/extragalactic/clusters/halo.py6
-rw-r--r--fg21sim/utils/cosmology.py (renamed from fg21sim/extragalactic/clusters/cosmology.py)0
-rw-r--r--fg21sim/utils/units.py (renamed from fg21sim/extragalactic/clusters/units.py)0
5 files changed, 6 insertions, 4 deletions
diff --git a/fg21sim/extragalactic/clusters/emission.py b/fg21sim/extragalactic/clusters/emission.py
index e71632b..1374b52 100644
--- a/fg21sim/extragalactic/clusters/emission.py
+++ b/fg21sim/extragalactic/clusters/emission.py
@@ -11,7 +11,7 @@ import numpy as np
import scipy.integrate
import scipy.special
-from .units import (Units as AU, Constants as AC)
+from ...utils.units import (Units as AU, Constants as AC)
logger = logging.getLogger(__name__)
diff --git a/fg21sim/extragalactic/clusters/formation.py b/fg21sim/extragalactic/clusters/formation.py
index f8c6d3a..1f48433 100644
--- a/fg21sim/extragalactic/clusters/formation.py
+++ b/fg21sim/extragalactic/clusters/formation.py
@@ -20,8 +20,8 @@ import scipy.integrate
import scipy.special
import scipy.optimize
-from .cosmology import Cosmology
from .mergertree import MergerTree
+from ...utils.cosmology import Cosmology
logger = logging.getLogger(__name__)
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index a6d5a20..02bd74b 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -18,10 +18,12 @@ import scipy.interpolate
import scipy.integrate
import scipy.optimize
-from .cosmology import Cosmology
from .formation import ClusterFormation
from .solver import FokkerPlanckSolver
-from .units import (Units as AU, UnitConversions as AUC, Constants as AC)
+from ...utils.cosmology import Cosmology
+from ...utils.units import (Units as AU,
+ UnitConversions as AUC,
+ Constants as AC)
logger = logging.getLogger(__name__)
diff --git a/fg21sim/extragalactic/clusters/cosmology.py b/fg21sim/utils/cosmology.py
index 12e581a..12e581a 100644
--- a/fg21sim/extragalactic/clusters/cosmology.py
+++ b/fg21sim/utils/cosmology.py
diff --git a/fg21sim/extragalactic/clusters/units.py b/fg21sim/utils/units.py
index a7e4ef5..a7e4ef5 100644
--- a/fg21sim/extragalactic/clusters/units.py
+++ b/fg21sim/utils/units.py