Fold cc factory into modeling tools

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

firecrown/app/examples/_des_y1_3x2pt_pt_template.py

@@ -20,7 +20,7 @@
 import firecrown.likelihood.number_counts as nc
 from firecrown.likelihood import ConstGaussian, NamedParameters, TwoPoint
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 
 
 def _build_sources() -> tuple[wl.WeakLensing, nc.NumberCounts]:

firecrown/app/examples/_des_y1_3x2pt_template.py

@@ -7,7 +7,7 @@
 import firecrown.likelihood.number_counts as nc
 from firecrown.likelihood import ConstGaussian, NamedParameters, TwoPoint
 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

firecrown/app/examples/_des_y1_cosmic_shear_hmia_template.py

@@ -11,7 +11,7 @@
 import firecrown.likelihood.weak_lensing as wl
 from firecrown.likelihood import ConstGaussian, NamedParameters, TwoPoint
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 
 
 def build_likelihood(params: NamedParameters) -> tuple[ConstGaussian, ModelingTools]:

firecrown/app/examples/_des_y1_cosmic_shear_pk_modifier_template.py

@@ -11,8 +11,8 @@
 import firecrown.likelihood.weak_lensing as wl
 from firecrown.likelihood import ConstGaussian, NamedParameters, TwoPoint
 from firecrown.modeling_tools import ModelingTools, PowerspectrumModifier
-from firecrown.ccl_factory import CCLFactory
-from firecrown.parameters import register_new_updatable_parameter
+from firecrown.modeling_tools import CCLFactory
+from firecrown.updatable import register_new_updatable_parameter
 
 
 # pylint: disable-next=invalid-name

firecrown/app/examples/_des_y1_cosmic_shear_tatt_template.py

@@ -11,7 +11,7 @@
 import firecrown.likelihood.weak_lensing as wl
 from firecrown.likelihood import ConstGaussian, NamedParameters, TwoPoint
 from firecrown.modeling_tools import ModelingTools
-from firecrown.ccl_factory import CCLFactory
+from firecrown.modeling_tools import CCLFactory
 
 # pylint: disable=duplicate-code
 

firecrown/app/examples/_sn_srd_template.py

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

firecrown/ccl_factory/__init__.py

@@ -1,37 +1,44 @@
-"""This module contains the CCLFactory class and it supporting classes.
+"""Deprecated: Use firecrown.modeling_tools instead.
 
-The CCLFactory class is a factory class that creates instances of the
-`pyccl.Cosmology` class.
+This module is deprecated and will be removed in a future version.
+All functionality has been moved to firecrown.modeling_tools.
 """
 
-# Import all public types and classes from private submodules
-from firecrown.ccl_factory._enums import (
+import warnings
+
+# Re-export everything from new location
+# Import must come after warnings to emit deprecation at import time
+from firecrown.modeling_tools import (  # noqa: E402
+    Background,
+    CAMBExtraParams,
+    CCLCalculatorArgs,
     CCLCreationMode,
+    CCLFactory,
     CCLPureModeTransferFunction,
-    PoweSpecAmplitudeParameter,
-)
-from firecrown.ccl_factory._factory import CCLFactory
-from firecrown.ccl_factory._models import (
-    CAMBExtraParams,
     CCLSplineParams,
     MuSigmaModel,
+    PoweSpecAmplitudeParameter,
+    PowerSpec,
+)
+
+# Emit deprecation warning when module is imported
+warnings.warn(
+    "firecrown.ccl_factory is deprecated and will be removed in a future version. "
+    "Use firecrown.modeling_tools instead.",
+    DeprecationWarning,
+    stacklevel=2,
 )
-from firecrown.ccl_factory._types import Background, CCLCalculatorArgs, PowerSpec
 
-# Define __all__ for explicit API contract
+# pylint: disable=duplicate-code
 __all__ = [
-    # Type definitions
     "PowerSpec",
     "Background",
     "CCLCalculatorArgs",
-    # Enum classes
     "PoweSpecAmplitudeParameter",
     "CCLCreationMode",
     "CCLPureModeTransferFunction",
-    # Model classes
     "MuSigmaModel",
     "CAMBExtraParams",
     "CCLSplineParams",
-    # Factory class
     "CCLFactory",
 ]

firecrown/connector/cobaya/likelihood.py

@@ -13,7 +13,7 @@
 from cobaya.likelihood import Likelihood
 from pyccl.cosmology import Pk2D
 
-from firecrown.ccl_factory import (
+from firecrown.modeling_tools import (
     CCLCalculatorArgs,
     CCLCreationMode,
     PoweSpecAmplitudeParameter,
@@ -27,7 +27,7 @@
     NamedParameters,
     load_likelihood,
 )
-from firecrown.parameters import ParamsMap, handle_unused_params
+from firecrown.updatable import ParamsMap, handle_unused_params
 from firecrown.updatable import UpdatableUsageRecord
 from firecrown.updatable import get_default_params_map
 

firecrown/connector/cosmosis/likelihood.py

@@ -13,7 +13,7 @@
 from cosmosis.datablock import names as section_names
 from cosmosis.datablock import option_section
 
-from firecrown.ccl_factory import CCLCreationMode
+from firecrown.modeling_tools import CCLCreationMode
 from firecrown.connector.mapping import MappingCosmoSIS, mapping_builder
 from firecrown.likelihood import (
     GaussFamily,
@@ -23,7 +23,7 @@
     load_likelihood,
     TwoPoint,
 )
-from firecrown.parameters import ParamsMap, handle_unused_params
+from firecrown.updatable import ParamsMap, handle_unused_params
 from firecrown.updatable import MissingSamplerParameterError, UpdatableUsageRecord
 
 

firecrown/connector/mapping.py

@@ -16,15 +16,15 @@
 from pyccl import physical_constants as physics
 from typing_extensions import assert_never
 
-from firecrown import parameters
-from firecrown.ccl_factory import (
+from firecrown.modeling_tools import (
     Background,
     CCLCalculatorArgs,
     PowerSpec,
     PoweSpecAmplitudeParameter,
 )
 from firecrown.descriptors import TypeFloat, TypeString
 from firecrown.likelihood import NamedParameters
+from firecrown.updatable import ParamsMap
 
 
 def build_ccl_background_dict(
@@ -489,7 +489,7 @@ def get_params_names(
             "wa",
         ]
 
-    def set_params_from_camb(self, params_values: parameters.ParamsMap) -> None:
+    def set_params_from_camb(self, params_values: ParamsMap) -> None:
         """Set the parameters in this mapping from the given CAMB-style parameters."""
         # pylint: disable-msg=R0914
 

firecrown/connector/numcosmo/helpers.py

@@ -3,7 +3,7 @@
 from numcosmo_py import Nc
 from typing_extensions import assert_never
 
-import firecrown.ccl_factory as fac
+import firecrown.modeling_tools as fac
 
 
 def get_hiprim(hi_cosmo: Nc.HICosmo) -> Nc.HIPrimPowerLaw:

firecrown/connector/numcosmo/numcosmo.py

@@ -9,7 +9,7 @@
 import numpy as np
 from numcosmo_py import GObject, Nc, Ncm, dict_to_var_dict, var_dict_to_dict
 
-from firecrown.ccl_factory import (
+from firecrown.modeling_tools import (
     CCLCalculatorArgs,
     CCLCreationMode,
     PoweSpecAmplitudeParameter,
@@ -23,7 +23,7 @@
     load_likelihood,
 )
 from firecrown.modeling_tools import ModelingTools
-from firecrown.parameters import ParamsMap, handle_unused_params
+from firecrown.updatable import ParamsMap, handle_unused_params
 from firecrown.updatable import UpdatableUsageRecord
 
 

firecrown/likelihood/_base.py

@@ -33,15 +33,16 @@
 from pydantic import BaseModel, ConfigDict, Field
 from scipy.interpolate import Akima1DInterpolator
 
-from firecrown import parameters
 from firecrown.data_types import DataVector, TheoryVector
 from firecrown.modeling_tools import ModelingTools
-from firecrown.parameters import (
+from firecrown.updatable import (
     DerivedParameterCollection,
     ParamsMap,
     RequiredParameters,
+    Updatable,
+    UpdatableCollection,
+    register_new_updatable_parameter,
 )
-from firecrown.updatable import Updatable, UpdatableCollection
 
 
 # ============================================================================
@@ -528,7 +529,7 @@ def __init__(self) -> None:
         # Data and theory will both be of length self.count
         self.count = 3
         self.data_vector: None | DataVector = None
-        self.mean = parameters.register_new_updatable_parameter(default_value=0.0)
+        self.mean = register_new_updatable_parameter(default_value=0.0)
         self.computed_theory_vector = False
 
     def read(self, sacc_data: sacc.Sacc) -> None:
@@ -896,7 +897,7 @@ def __init__(self, sacc_tracer: str, active: bool = True) -> None:
         """
         super().__init__(parameter_prefix=sacc_tracer)
 
-        self.delta_z = parameters.register_new_updatable_parameter(
+        self.delta_z = register_new_updatable_parameter(
             default_value=SOURCE_GALAXY_SYSTEMATIC_DEFAULT_DELTA_Z
         )
         if active:
@@ -965,7 +966,7 @@ def __init__(self, sacc_tracer: str, active: bool = True) -> None:
         """
         super().__init__(sacc_tracer)
 
-        self.sigma_z = parameters.register_new_updatable_parameter(
+        self.sigma_z = register_new_updatable_parameter(
             default_value=SOURCE_GALAXY_SYSTEMATIC_DEFAULT_SIGMA_Z
         )
 

firecrown/likelihood/_gaussfamily.py

@@ -20,7 +20,7 @@
     Statistic,
 )
 from firecrown.modeling_tools import ModelingTools
-from firecrown.parameters import ParamsMap
+from firecrown.updatable import ParamsMap
 from firecrown.updatable import UpdatableCollection
 from firecrown.utils import save_to_sacc
 

firecrown/likelihood/_student_t.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from firecrown import parameters
+from firecrown.updatable import register_new_updatable_parameter
 from firecrown.likelihood._base import Statistic
 from firecrown.likelihood._gaussfamily import GaussFamily
 from firecrown.modeling_tools import ModelingTools
@@ -30,7 +30,7 @@ def __init__(
         :param nu: The degrees of freedom of the T-distribution
         """
         super().__init__(statistics)
-        self.nu = parameters.register_new_updatable_parameter(nu, default_value=3.0)
+        self.nu = register_new_updatable_parameter(nu, default_value=3.0)
 
     def compute_loglike(self, tools: ModelingTools) -> float:
         """Compute the log-likelihood.