split into two files for binned and unbinned

.github/workflows/testing.yml

@@ -28,7 +28,7 @@ jobs:
     - name: install reqs
       run: |
         conda install pip compilers pytest pytest-cov pyccl cython
-        pip install cobaya
+        pip install cobaya nemo-sz
 
       env:  
         MATRIX_OS: ${{ matrix.os }}

.gitignore

@@ -102,3 +102,22 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+
+# clusters
+soliket/clusters/data/selFn*
+soliket/clusters/data/*zip
+soliket/clusters/data/*fits
+soliket/clusters/chains
+soliket/clusters/notebooks/figures
+soliket/clusters/data/act/*
+soliket/clusters/data/advact/*
+.DS_Store
+soliket/ymap
+soliket/cosmopower
+soliket/clusters/checks/*
+soliket/clusters/notebooks/figs/*
+soliket/clusters/notebooks/ongoing/*
+
+# cibxlensing
+soliket/cibxlensing/chains

chains/test_unbinned_classy_sz_evaluate.input.yaml

@@ -0,0 +1,117 @@
+theory:
+  classy_szfast.classy_sz.classy_sz:
+    use_class_sz_fast_mode: 1
+    stop_at_error: true
+    extra_args:
+      output: sz_cluster_counts_fft,m500c_to_m200c,m200c_to_m500
+      mass function: T08M200c
+      concentration parameter: B13
+      B: 1.0
+      N_ncdm: 1
+      N_ur: 2.0328
+      m_ncdm: 0.06
+      T_ncdm: 0.71611
+      M_min: 10000000000000.0
+      M_max: 1.0e+16
+      ndim_redshifts: 100
+      szcounts_fft_nz: 100,
+      n_m_dndlnM: 100,
+      n_z_dndlnM: 100,
+      has_selection_function: 1
+      experiment: 1
+      y_m_relation: 1
+      signal-to-noise_cut-off_for_survey_cluster_completeness: 5.0
+      sz_selection_function_thetas_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/nemo_sim_thetas_120923_30bins.txt
+      sz_selection_function_skyfracs_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/nemo_sim_skyfracs_120923_30bins.txt
+      sz_selection_function_ylims_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/nemo_sim_ylims_120923_30bins.txt
+      SZ_cat_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/SZ_cat_nemosimkit_130923.txt
+      A_ym: 1.9e-05
+      B_ym: 0.08
+      C_ym: 0.0
+      sigmaM_ym: 0.173
+      m_pivot_ym_[Msun]: 425000000000000.0
+      use_m500c_in_ym_relation: 0
+      use_m200c_in_ym_relation: 1
+      use_skyaveraged_noise: 0
+      N_samp_fftw: 2048
+      z_min: 0.0
+      z_max: 2.0
+      szcounts_fft_z_min: 0.0
+      szcounts_fft_z_max: 2.0
+      tol_dlnm_dlnq: 0.01
+      ntab_dlnm_dlnq: 80
+      szcounts_qmax_fft_padded: 200.0
+      sigma_derivative: 0
+      szcc_dof: 3.0
+      szcc_qtrunc: 2.0
+      HMF_prescription_NCDM: 1
+      no_spline_in_tinker: 1
+likelihood:
+  soliket.UnbinnedClusterLikelihood:
+    stop_at_error: true
+    verbose: false
+    data:
+      data_path: data/advact/DR5CosmoSims/sim-kit_NemoCCL_A10tSZ_DR5White_ACT-DR5_tenToA0Tuned/NemoCCL_A10tSZ_DR5White_ACT-DR5_tenToA0Tuned/
+      cat_file: NemoCCL_A10tSZ_DR5White_ACT-DR5_tenToA0Tuned_mass.fits
+      Q_file: selFn/QFit.fits
+      tile_file: selFn/tileAreas.txt
+      rms_file: selFn/RMSTab.fits
+    theorypred:
+      choose_theory: classy_sz
+      massfunc_mode: ccl
+      md_hmf: 200c
+      md_ym: 200c
+      compl_mode: erf_diff
+      rel_correction: false
+    YM:
+      Mpivot: 425000000000000.0
+    selfunc:
+      SNRcut: 5.0
+      method: SNRbased
+      whichQ: fit
+      resolution: downsample
+      dwnsmpl_bins: 30
+      save_dwsmpld: false
+      debiasDOF: 0.0
+      debias_cutoff: 0.0
+    binning:
+      z:
+        zmin: 0.0
+        zmax: 2.0
+        dz: 0.1
+      q:
+        log10qmin: 0.6
+        log10qmax: 2.0
+        dlog10q: 0.25
+      M:
+        Mmin: 50000000000000.0
+        Mmax: 1.0e+16
+        dlogM: 0.01
+      exclude_zbin: 0
+params:
+  h: 0.68
+  n_s: 0.965
+  Omega_b: 0.049
+  Omega_cdm: 0.261
+  tau_reio: 0.06
+  tenToA0: 1.9e-05
+  B0: 0.08
+  scatter_sz: 0.2
+  bias_sz: 1
+  C0: 0.0
+  sigma8:
+    prior:
+      min: 0.0
+      max: 4.0
+    ref:
+      dist: norm
+      loc: 0.8
+      scale: 0.001
+    proposal: 0.001
+    latex: \sigma_8
+sampler:
+  evaluate:
+    override:
+      sigma8: 0.81
+output: test_unbinned_classy_sz_evaluate
+stop_at_error: true

chains/test_unbinned_classy_sz_evaluate.updated.yaml

@@ -0,0 +1,185 @@
+theory:
+  classy_szfast.classy_sz.classy_sz:
+    use_class_sz_fast_mode: 1
+    lensing_lkl: SOLikeT
+    ell_factor: false
+    path: null
+    speed: 0.2
+    stop_at_error: true
+    extra_args:
+      output: sz_cluster_counts_fft,m500c_to_m200c,m200c_to_m500
+      mass function: T08M200c
+      concentration parameter: B13
+      B: 1.0
+      N_ncdm: 1
+      N_ur: 2.0328
+      m_ncdm: 0.06
+      T_ncdm: 0.71611
+      M_min: 10000000000000.0
+      M_max: 1.0e+16
+      ndim_redshifts: 100
+      szcounts_fft_nz: 100,
+      n_m_dndlnM: 100,
+      n_z_dndlnM: 100,
+      has_selection_function: 1
+      experiment: 1
+      y_m_relation: 1
+      signal-to-noise_cut-off_for_survey_cluster_completeness: 5.0
+      sz_selection_function_thetas_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/nemo_sim_thetas_120923_30bins.txt
+      sz_selection_function_skyfracs_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/nemo_sim_skyfracs_120923_30bins.txt
+      sz_selection_function_ylims_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/nemo_sim_ylims_120923_30bins.txt
+      SZ_cat_file: /Users/boris/Work/CLASS-SZ/SO-SZ/class_sz/class_sz_auxiliary_files/SZ_cat_nemosimkit_130923.txt
+      A_ym: 1.9e-05
+      B_ym: 0.08
+      C_ym: 0.0
+      sigmaM_ym: 0.173
+      m_pivot_ym_[Msun]: 425000000000000.0
+      use_m500c_in_ym_relation: 0
+      use_m200c_in_ym_relation: 1
+      use_skyaveraged_noise: 0
+      N_samp_fftw: 2048
+      z_min: 0.0
+      z_max: 2.0
+      szcounts_fft_z_min: 0.0
+      szcounts_fft_z_max: 2.0
+      tol_dlnm_dlnq: 0.01
+      ntab_dlnm_dlnq: 80
+      szcounts_qmax_fft_padded: 200.0
+      sigma_derivative: 0
+      szcc_dof: 3.0
+      szcc_qtrunc: 2.0
+      HMF_prescription_NCDM: 1
+      no_spline_in_tinker: 1
+    ignore_obsolete: false
+    use_renames: false
+    renames:
+      As: A_s
+      ns: n_s
+      nrun: alpha_s
+      nrunrun: beta_s
+      nt: n_t
+      ntrun: alpha_t
+      rdrag: rs_drag
+      omegak: Omega_k
+      omegal: Omega_Lambda
+      w: w0_fld
+      wa: wa_fld
+      omegabh2: omega_b
+      omegab: Omega_b
+      omegach2: omega_cdm
+      omegac: Omega_cdm
+      omegam: Omega_m
+      omegan: Omega_nu
+      tau: tau_reio
+      zrei: z_reio
+      deltazrei: reionization_width
+      helium_redshift: helium_fullreio_redshift
+      helium_delta_redshift: helium_fullreio_width
+      yhe: YHe
+      yheused: YHe
+    version: null
+likelihood:
+  soliket.UnbinnedClusterLikelihood:
+    name: Unbinned Clusters
+    columns:
+    - z
+    - tsz_signal
+    - tsz_signal_err
+    - tile_name
+    verbose: false
+    data:
+      data_path: data/advact/DR5CosmoSims/sim-kit_NemoCCL_A10tSZ_DR5White_ACT-DR5_tenToA0Tuned/NemoCCL_A10tSZ_DR5White_ACT-DR5_tenToA0Tuned/
+      cat_file: NemoCCL_A10tSZ_DR5White_ACT-DR5_tenToA0Tuned_mass.fits
+      Q_file: selFn/QFit.fits
+      tile_file: selFn/tileAreas.txt
+      rms_file: selFn/RMSTab.fits
+    theorypred:
+      choose_theory: classy_sz
+      massfunc_mode: ccl
+      md_hmf: 200c
+      md_ym: 200c
+      compl_mode: erf_diff
+      rel_correction: false
+    selfunc:
+      SNRcut: 5.0
+      method: SNRbased
+      whichQ: fit
+      resolution: downsample
+      dwnsmpl_bins: 30
+      save_dwsmpld: false
+      debiasDOF: 0.0
+      debias_cutoff: 0.0
+    binning:
+      z:
+        zmin: 0.0
+        zmax: 2.0
+        dz: 0.1
+      q:
+        log10qmin: 0.6
+        log10qmax: 2.0
+        dlog10q: 0.25
+      M:
+        Mmin: 50000000000000.0
+        Mmax: 1.0e+16
+        dlogM: 0.01
+      exclude_zbin: 0
+    YM:
+      Mpivot: 425000000000000.0
+    type: []
+    speed: -1
+    stop_at_error: true
+    version: null
+params:
+  h:
+    value: 0.68
+  n_s:
+    value: 0.965
+    renames:
+    - ns
+  Omega_b:
+    value: 0.049
+    renames:
+    - omegab
+  Omega_cdm:
+    value: 0.261
+    renames:
+    - omegac
+  tau_reio:
+    value: 0.06
+    renames:
+    - tau
+  tenToA0:
+    derived: false
+    value: 1.9e-05
+  B0:
+    derived: false
+    value: 0.08
+  scatter_sz:
+    derived: false
+    value: 0.2
+  bias_sz:
+    derived: false
+    value: 1
+  C0:
+    derived: false
+    value: 0.0
+  sigma8:
+    prior:
+      min: 0.0
+      max: 4.0
+    ref:
+      dist: norm
+      loc: 0.8
+      scale: 0.001
+    proposal: 0.001
+    latex: \sigma_8
+sampler:
+  evaluate:
+    N: 1
+    override:
+      sigma8: 0.81
+    seed: null
+    version: null
+output: test_unbinned_classy_sz_evaluate
+stop_at_error: true
+version: '3.3'

setup.py

@@ -14,19 +14,19 @@
             "*.yaml",
             "*.bibtex",
             # "data/simulated*/*.txt",
-            "clusters/data/*",
-            "clusters/data/selFn_equD56/*",
-            "lensing/data/*.txt",
+            # "clusters/data/*",
+            # "clusters/data/selFn_equD56/*",
+            # "lensing/data/*.txt",
         ]
     },
     install_requires=[
         "astropy",
         "scikit-learn",
-        "cobaya",
+        #"cobaya",
         "sacc",
         "pyccl",
-        "fgspectra @ git+https://github.com/simonsobs/fgspectra@act_sz_x_cib#egg=fgspectra", # noqa E501
-        "mflike @ git+https://github.com/simonsobs/lat_mflike@master"
+        #"fgspectra @ git+https://github.com/simonsobs/fgspectra@act_sz_x_cib#egg=fgspectra", # noqa E501
+        #"mflike @ git+https://github.com/simonsobs/lat_mflike@master"
     ],
     test_suite="soliket.tests",
     include_package_data=True,

soliket/__init__.py

@@ -1,12 +1,17 @@
 from .lensing import LensingLiteLikelihood, LensingLikelihood  # noqa: F401
 from .gaussian import GaussianLikelihood, MultiGaussianLikelihood  # noqa: F401
 from .ps import PSLikelihood, BinnedPSLikelihood  # noqa: F401
-from .clusters import ClusterLikelihood  # noqa: F401
+try:
+    from .clusters import BinnedClusterLikelihood, UnbinnedClusterLikelihood  # noqa: F401
+except ImportError:
+    print('Skipping clusters module as not all requirements installed')
+    pass
 from .mflike import MFLike  # noqa: F401
 from .mflike import TheoryForge_MFLike
 from .xcorr import XcorrLikelihood  # noqa: F401
 from .foreground import Foreground
 from .bandpass import BandPass
+from .cibxlensing import CIBxKAPPA_Likelihood
 
 try:
     import pyccl as ccl  # noqa: F401