Merge pull request #611 from LSSTDESC/fold_packages

Author: marcpaterno

environment.yml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   - alabaster
   - babel
-  - black
+  - black = 25.12.0
   - charset-normalizer
   - clmm
   - compilers

examples/des_y1_3x2pt/des_y1_cosmic_shear_HMIA.py

@@ -5,10 +5,10 @@
 
 import firecrown.likelihood.weak_lensing as wl
 from firecrown.likelihood import TwoPoint, ConstGaussian, Likelihood
-from firecrown.parameters import ParamsMap
+from firecrown.updatable import ParamsMap
 from firecrown.modeling_tools import ModelingTools
 from firecrown.likelihood.factories import load_sacc_data
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 from firecrown.updatable import get_default_params_map
 from firecrown.metadata_types import TracerNames
 

examples/des_y1_3x2pt/des_y1_cosmic_shear_TATT.py

@@ -7,9 +7,9 @@
 from firecrown.likelihood.factories import load_sacc_data
 import firecrown.likelihood.weak_lensing as wl
 from firecrown.likelihood import TwoPoint, ConstGaussian, Likelihood
-from firecrown.parameters import ParamsMap
+from firecrown.updatable import ParamsMap
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 from firecrown.updatable import get_default_params_map
 from firecrown.metadata_types import TracerNames, TRACER_NAMES_TOTAL
 

examples/des_y1_3x2pt/des_y1_cosmic_shear_pk_modifier.py

@@ -10,9 +10,9 @@
 from firecrown.likelihood.factories import load_sacc_data
 import firecrown.likelihood.weak_lensing as wl
 from firecrown.likelihood import TwoPoint, ConstGaussian, Likelihood
-from firecrown.parameters import ParamsMap, register_new_updatable_parameter
+from firecrown.updatable import ParamsMap, register_new_updatable_parameter
 from firecrown.modeling_tools import ModelingTools, PowerspectrumModifier
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 from firecrown.updatable import get_default_params_map
 from firecrown.metadata_types import TracerNames
 

examples/des_y1_3x2pt/factory.py

@@ -7,7 +7,7 @@
 import firecrown.likelihood.weak_lensing as wl
 import firecrown.likelihood.number_counts as nc
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 
 
 # The likelihood used for DES Y1 3x2pt analysis is a Gaussian likelihood, which

examples/des_y1_3x2pt/factory_PM.py

@@ -8,7 +8,7 @@
 import firecrown.likelihood.weak_lensing as wl
 import firecrown.likelihood.number_counts as nc
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 
 
 # The likelihood used for DES Y1 3x2pt analysis is a Gaussian likelihood, which

examples/des_y1_3x2pt/factory_PT.py

@@ -14,9 +14,9 @@
 from firecrown.likelihood.factories import load_sacc_data
 from firecrown.likelihood import TwoPoint, ConstGaussian, Likelihood
 from firecrown.metadata_types import TracerNames
-from firecrown.parameters import ParamsMap
+from firecrown.updatable import ParamsMap
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 from firecrown.updatable import get_default_params_map
 
 

firecrown/app/analysis/_types.py

@@ -17,7 +17,7 @@
 import pyccl
 
 from firecrown.likelihood import NamedParameters
-from firecrown.ccl_factory import CAMBExtraParams, PoweSpecAmplitudeParameter
+from firecrown.modeling_tools import CAMBExtraParams, PoweSpecAmplitudeParameter
 
 
 class Frameworks(StrEnum):

firecrown/app/cosmology.py

@@ -16,7 +16,7 @@
 import yaml
 import pyccl
 
-from firecrown.ccl_factory import CAMBExtraParams
+from firecrown.modeling_tools import CAMBExtraParams
 from . import logging
 from .analysis import CCLCosmologySpec, Prior
 

firecrown/app/examples/_cosmic_shear_template.py

@@ -17,7 +17,7 @@
 from firecrown.likelihood import ConstGaussian, NamedParameters, TwoPoint
 from firecrown.likelihood.factories import load_sacc_data
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 
 
 def build_likelihood(params: NamedParameters):