diff --git a/clmm/cosmology/cluster_toolkit.py b/clmm/cosmology/cluster_toolkit.py index 69193f246..ede3c34f9 100644 --- a/clmm/cosmology/cluster_toolkit.py +++ b/clmm/cosmology/cluster_toolkit.py @@ -6,7 +6,7 @@ from astropy import units from astropy.cosmology import LambdaCDM, FlatLambdaCDM -from ..constants import Constants as const +from ..utils.constants import Constants as const from .parent_class import CLMMCosmology diff --git a/clmm/cosmology/parent_class.py b/clmm/cosmology/parent_class.py index e2f75df68..ea42f674f 100644 --- a/clmm/cosmology/parent_class.py +++ b/clmm/cosmology/parent_class.py @@ -4,7 +4,7 @@ # CLMM Cosmology object abstract superclass import numpy as np from ..utils import validate_argument, compute_for_good_redshifts -from ..constants import Constants as const +from ..utils.constants import Constants as const class CLMMCosmology: diff --git a/clmm/utils/__init__.py b/clmm/utils/__init__.py index a6782415f..016137083 100644 --- a/clmm/utils/__init__.py +++ b/clmm/utils/__init__.py @@ -1,6 +1,6 @@ """General utility functions that are used in multiple modules""" -from . import redshift_distributions +from . import redshift_distributions, constants from .beta_lens import ( compute_beta, diff --git a/clmm/constants.py b/clmm/utils/constants.py similarity index 100% rename from clmm/constants.py rename to clmm/utils/constants.py diff --git a/clmm/utils/validation.py b/clmm/utils/validation.py index 1002ed222..e55b07c86 100644 --- a/clmm/utils/validation.py +++ b/clmm/utils/validation.py @@ -1,7 +1,7 @@ """General utility functions that are used in multiple modules""" import numpy as np -from ..constants import Constants as const +from ..utils.constants import Constants as const def arguments_consistency(arguments, names=None, prefix=""): @@ -226,6 +226,7 @@ def _validate_is_deltasigma_sigma_c(is_deltasigma, sigma_c): if not is_deltasigma and sigma_c is not None: raise TypeError(f"sigma_c (={sigma_c}) must be None when is_deltasigma=False") + def _validate_coordinate_system(loc, coordinate_system, valid_type): r"""Validate the coordinate system. @@ -245,6 +246,7 @@ def _validate_coordinate_system(loc, coordinate_system, valid_type): if loc[coordinate_system] not in ["celestial", "euclidean"]: raise ValueError(f"{coordinate_system} must be 'celestial' or 'euclidean'.") + class DiffArray: """Array where arr1==arr2 is actually all(arr1==arr)""" diff --git a/tests/test_cosmo_parent.py b/tests/test_cosmo_parent.py index 67de814db..d2956917e 100644 --- a/tests/test_cosmo_parent.py +++ b/tests/test_cosmo_parent.py @@ -4,7 +4,7 @@ from numpy.testing import assert_raises, assert_allclose, assert_equal import clmm.theory as theo from clmm.cosmology.parent_class import CLMMCosmology -from clmm.constants import Constants as const +from clmm.utils.constants import Constants as const # ----------- Some Helper Functions for the Validation Tests --------------- diff --git a/tests/test_theory.py b/tests/test_theory.py index fe64d3d5e..14b14ea07 100644 --- a/tests/test_theory.py +++ b/tests/test_theory.py @@ -5,7 +5,7 @@ from numpy.testing import assert_raises, assert_allclose, assert_equal from astropy.cosmology import FlatLambdaCDM, LambdaCDM import clmm.theory as theo -from clmm.constants import Constants as clc +from clmm.utils.constants import Constants as clc from clmm.galaxycluster import GalaxyCluster from clmm import GCData from clmm.utils import (