From 36a9acc9cbab3e2108105654c69d29aa565afed4 Mon Sep 17 00:00:00 2001 From: Antony Lewis Date: Tue, 15 Feb 2022 19:01:03 +0000 Subject: [PATCH] force upgrade pip; tidy BAO --- .travis.yml | 1 + cobaya/likelihoods/bao/sdss_dr16_baoplus_elg.yaml | 3 +-- cobaya/likelihoods/bao/sdss_dr16_baoplus_lrg.yaml | 4 +--- cobaya/likelihoods/bao/sdss_dr16_baoplus_lyauto.yaml | 3 +-- cobaya/likelihoods/bao/sdss_dr16_baoplus_lyxqso.yaml | 3 +-- cobaya/likelihoods/bao/sdss_dr16_baoplus_qso.yaml | 2 -- setup.py | 2 +- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c4441288..4057c14b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,6 +106,7 @@ before_install: else pip install mpi4py pytest-forked pytest-cov flaky matplotlib dill coverage flake8; fi + - python -m pip install --upgrade pip - python --version script: diff --git a/cobaya/likelihoods/bao/sdss_dr16_baoplus_elg.yaml b/cobaya/likelihoods/bao/sdss_dr16_baoplus_elg.yaml index 0cd93fa88..bf860f48f 100644 --- a/cobaya/likelihoods/bao/sdss_dr16_baoplus_elg.yaml +++ b/cobaya/likelihoods/bao/sdss_dr16_baoplus_elg.yaml @@ -7,8 +7,7 @@ grid_file: bao_data/sdss_DR16_ELG_FSBAO_DMDHfs8gridlikelihood.txt observable_1: DM_over_rs observable_2: DH_over_rs observable_3: f_sigma8 -rs_rescale: 1 -# Redshift +# Redshift redshift: 0.85 # Aliases for automatic covariance matrix aliases: [BAO] diff --git a/cobaya/likelihoods/bao/sdss_dr16_baoplus_lrg.yaml b/cobaya/likelihoods/bao/sdss_dr16_baoplus_lrg.yaml index 0cfc2b0d1..88a6beaf2 100644 --- a/cobaya/likelihoods/bao/sdss_dr16_baoplus_lrg.yaml +++ b/cobaya/likelihoods/bao/sdss_dr16_baoplus_lrg.yaml @@ -1,12 +1,10 @@ -# eBOSS LRG results, combining measurements from eBOSS DR16 and +# eBOSS LRG results, combining measurements from eBOSS DR16 and # BOSS DR12 as described in, Alam et al. 2020 # https://arxiv.org/pdf/2007.08991.pdf path: null measurements_file: bao_data/sdss_DR16_BAOplus_LRG_FSBAO_DMDHfs8.dat cov_file: bao_data/sdss_DR16_BAOplus_LRG_FSBAO_DMDHfs8_covtot.txt -# Fiducial sound horizon with which data have been stored -rs_fid: 1 # Mpc # Aliases for automatic covariance matrix aliases: [BAO] # Speed in evaluations/second diff --git a/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyauto.yaml b/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyauto.yaml index ed0c71aba..6e5232d8f 100644 --- a/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyauto.yaml +++ b/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyauto.yaml @@ -6,8 +6,7 @@ grid_file: bao_data/sdss_DR16_LYAUTO_BAO_DMDHgrid.txt # The measurements used observable_1: DM_over_rs observable_2: DH_over_rs -rs_rescale: 1 -# Redshift +# Redshift redshift: 2.334 # Aliases for automatic covariance matrix aliases: [BAO] diff --git a/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyxqso.yaml b/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyxqso.yaml index d53f96e58..56930e1f2 100644 --- a/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyxqso.yaml +++ b/cobaya/likelihoods/bao/sdss_dr16_baoplus_lyxqso.yaml @@ -6,8 +6,7 @@ grid_file: bao_data/sdss_DR16_LYxQSO_BAO_DMDHgrid.txt # The measurements used observable_1: DM_over_rs observable_2: DH_over_rs -rs_rescale: 1 -# Redshift +# Redshift redshift: 2.334 # Aliases for automatic covariance matrix aliases: [BAO] diff --git a/cobaya/likelihoods/bao/sdss_dr16_baoplus_qso.yaml b/cobaya/likelihoods/bao/sdss_dr16_baoplus_qso.yaml index 42be5a636..1f1b3a78b 100644 --- a/cobaya/likelihoods/bao/sdss_dr16_baoplus_qso.yaml +++ b/cobaya/likelihoods/bao/sdss_dr16_baoplus_qso.yaml @@ -4,8 +4,6 @@ path: null measurements_file: bao_data/sdss_DR16_BAOplus_QSO_FSBAO_DMDHfs8.dat cov_file: bao_data/sdss_DR16_BAOplus_QSO_FSBAO_DMDHfs8_covtot.txt -# Fiducial sound horizon with which data have been stored -rs_fid: 1 # Mpc # Redshift redshift: 2.334 # Aliases for automatic covariance matrix diff --git a/setup.py b/setup.py index bf47ba268..a1f410196 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ def extract_docs_requirements(): return ["sphinx"] + reqs -install_requires = ['numpy>=1.17.0', 'scipy>=1.5', 'pandas>=1.0.1,!=1.4.0', +install_requires = ['numpy>=1.17.0', 'scipy>=1.5', 'pandas>=1.0.1', 'PyYAML>=5.1', 'requests>=2.18', 'py-bobyqa>=1.2', 'GetDist>=1.3.1', 'fuzzywuzzy>=0.17', 'packaging', 'tqdm', 'portalocker>=2.3.0', 'dill>=0.3.3']