move constants to utils

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
 

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:

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,

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)"""
 

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 ---------------
 

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 (