🩹 Fix imports

CMBSciPol · May 11, 2024 · ddefcd5 · ddefcd5
1 parent 4bccdf2
commit ddefcd5
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 17 deletions.
diff --git a/micmac/Harmonic_Likelihood_sampling.py b/micmac/Harmonic_Likelihood_sampling.py
@@ -28,13 +28,18 @@
 import toml
 from jax import config
 
-from .jax_Sampling_toolbox import *
-from .jax_tools import *
-from .mixingmatrix import *
-from .noisecovar import *
-from .templates_spv import *
-from .tools import *
-from .utils import *
+from .jax_Sampling_toolbox import (
+    Sampling_functions,
+    multivariate_Metropolis_Hasting_step_numpyro_bounded,
+)
+from .jax_tools import (
+    frequency_alms_x_obj_red_covariance_cell_JAX,
+    get_reduced_matrix_from_c_ell_jax,
+)
+from .noisecovar import get_true_Cl_noise
+from .templates_spv import get_nodes_b, tree_spv_config
+from .tools import get_c_ells_from_red_covariance_matrix, get_reduced_matrix_from_c_ell
+from .utils import generate_power_spectra_CAMB
 
 config.update('jax_enable_x64', True)
 

diff --git a/micmac/Non_param_Likelihood_sampling.py b/micmac/Non_param_Likelihood_sampling.py
@@ -28,13 +28,30 @@
 from jax import config
 from jax_tqdm import scan_tqdm
 
-from .jax_Sampling_toolbox import *
-from .jax_tools import *
-from .mixingmatrix import *
-from .noisecovar import *
-from .templates_spv import *
-from .tools import *
-from .utils import *
+from .jax_Sampling_toolbox import (
+    Sampling_functions,
+    separate_single_MH_step_index_accelerated,
+    separate_single_MH_step_index_v2b,
+    separate_single_MH_step_index_v4_pixel,
+    separate_single_MH_step_index_v4b_pixel,
+    single_Metropolis_Hasting_step,
+)
+from .jax_tools import (
+    get_cell_from_map_jax,
+    get_reduced_matrix_from_c_ell_jax,
+    get_sqrt_reduced_matrix_from_matrix_jax,
+    maps_x_red_covariance_cell_JAX,
+)
+from .noisecovar import (
+    get_BtinvN,
+    get_inv_BtinvNB,
+    get_inv_BtinvNB_c_ell,
+    get_noise_covar_extended,
+    get_Wd,
+)
+from .templates_spv import get_nodes_b, tree_spv_config
+from .tools import get_c_ells_from_red_covariance_matrix, get_reduced_matrix_from_c_ell
+from .utils import generate_power_spectra_CAMB, get_instr
 
 config.update('jax_enable_x64', True)
 

diff --git a/micmac/jax_Sampling_toolbox.py b/micmac/jax_Sampling_toolbox.py
@@ -24,9 +24,17 @@
 import numpyro.distributions as dist
 from jax import random
 
-from .jax_tools import *
-from .mixingmatrix import *
-from .noisecovar import *
+from .jax_tools import (
+    alm_dot_product_JAX,
+    alms_x_red_covariance_cell_JAX,
+    frequency_alms_x_obj_red_covariance_cell_JAX,
+    get_bool_array_in_boundary,
+    get_reduced_matrix_from_c_ell_jax,
+    get_sqrt_reduced_matrix_from_matrix_jax,
+    maps_x_red_covariance_cell_JAX,
+)
+from .mixingmatrix import MixingMatrix
+from .noisecovar import get_BtinvN, get_inv_BtinvNB, get_inv_BtinvNB_c_ell
 
 
 class Sampling_functions(MixingMatrix):