-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
nGC covariance #114
Merged
Merged
nGC covariance #114
Changes from 26 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
554345f
covNG: first commit
carlosggarcia 25ee2ac
removed unused lines
carlosggarcia 02a8308
unified a and k arrays
carlosggarcia 13f2bff
covNG: added all terms. 1h with galaxy bias. Probably not good enough.
carlosggarcia a674167
covNG: added tests. super slow
carlosggarcia 8be34e7
cNG: fixed typo
carlosggarcia 6fc92b6
cNG: multiply biases 234h terms only
carlosggarcia 34cd954
initial hod implementation for cNG
paulrogozenski aacbca8
added HOD parameters to cNG tests
paulrogozenski 2406b8a
black reformatting
paulrogozenski 774a44c
black reformatting
paulrogozenski 7d4619a
notes for more accurate testing of cNG approximation
paulrogozenski ecd7f0b
Tests created and pass locally
paulrogozenski a7d1a00
Linters fix
paulrogozenski cc2e71c
Linters fix
paulrogozenski a494da0
change to spline integration method for testing (more stable)
paulrogozenski 5530700
change to spline integration method for testing (more stable)
paulrogozenski 8e76abc
refactoring to allow reading in of fsky directly with tests
paulrogozenski fa6d3c4
refactoring to allow reading in of fsky directly with tests
paulrogozenski 1760ec3
refactoring to allow reading in of fsky directly with tests
paulrogozenski 59fa8b4
_get_fsky refactoring and added HOD generalization for computing the …
paulrogozenski ff40673
Merge branch 'master' into covNG
paulrogozenski 1f17ae5
nfw profile for weaklensing 1h Trispectrum terms, reformatted tests a…
paulrogozenski c059d88
nfw profile for weaklensing 1h Trispectrum terms, reformatted tests a…
paulrogozenski 3c419a0
Merge branch 'covNG' of https://github.com/LSSTDESC/TJPCov into covNG
paulrogozenski f54c89a
CCL requirement to latest version
paulrogozenski 821cb7c
reformatting to unify fsky parameter into main tjpcov yaml header
paulrogozenski 03dc539
debugging of refactored code
paulrogozenski fee0e9d
cNG: skip slow tests in CI
carlosggarcia 9dc12a2
blacked
carlosggarcia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
tjpcov: | ||
# sacc input file | ||
sacc_file: ./tests/benchmarks/32_DES_tjpcov_bm/cls_cov.fits | ||
|
||
# 'set' from parameters OR pass CCL cosmology object OR yaml file | ||
cosmo: 'set' | ||
|
||
# Setting mask OR fsky approximation | ||
mask_file: | ||
DESgc__0: ./tests/benchmarks/32_DES_tjpcov_bm/catalogs/mask_DESgc__0.fits.gz | ||
DESwl__0: ./tests/benchmarks/32_DES_tjpcov_bm/catalogs/DESwlMETACAL_mask_zbin0_ns32.fits.gz | ||
DESwl__1: ./tests/benchmarks/32_DES_tjpcov_bm/catalogs/DESwlMETACAL_mask_zbin1_ns32.fits.gz | ||
|
||
mask_names: | ||
DESgc__0: mask_DESgc0 | ||
DESwl__0: mask_DESwl0 | ||
DESwl__1: mask_DESwl1 | ||
|
||
outdir: ./tests/tmp/ | ||
|
||
# Survey params: | ||
# 5 lens bins | ||
Ngal_DESgc__0: 26 | ||
|
||
Ngal_DESwl__0: 26 | ||
Ngal_DESwl__1: 26 | ||
# # constant bin sigma_e | ||
sigma_e_DESwl__0: 0.26 | ||
sigma_e_DESwl__1: 0.26 | ||
|
||
# linear bias for lenses constant for redshift bin (example notebook) | ||
bias_DESgc__0: 1.48 | ||
|
||
# IA: 0.5 | ||
|
||
parameters: | ||
# Not used for while (read by ccl.cosmo): | ||
Omega_c: 0.2640 | ||
Omega_b: 0.0493 | ||
h: 0.6736 | ||
n_s: 0.9649 | ||
sigma8: 0.8111 | ||
w0: -1 | ||
wa: 0 | ||
transfer_function: 'boltzmann_camb' | ||
HOD: | ||
# automatically creates massdef and concentration objects | ||
log10Mmin_0: 12.0 | ||
log10Mmin_p: 0.0 | ||
siglnM_0: 0.4 | ||
siglnM_p: 0.0 | ||
log10M0_0: 7.0 | ||
log10M0_p: 0.0 | ||
log10M1_0: 13.3 | ||
log10M1_p: 0.0 | ||
alpha_0: 1.0 | ||
alpha_p: 0.0 | ||
fc_0: 1.0 | ||
fc_p: 0.0 | ||
bg_0: 1.0 | ||
bg_p: 0.0 | ||
bmax_0: 1.0 | ||
bmax_p: 0.0 | ||
a_pivot: 1.0 | ||
ns_independent: False |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
tjpcov: | ||
# sacc input file | ||
sacc_file: ./tests/benchmarks/32_DES_tjpcov_bm/cls_cov.fits | ||
|
||
# 'set' from parameters OR pass CCL cosmology object OR yaml file | ||
cosmo: 'set' | ||
|
||
# Setting mask OR fsky approximation | ||
mask_file: | ||
DESgc__0: ./tests/benchmarks/32_DES_tjpcov_bm/catalogs/mask_DESgc__0.fits.gz | ||
DESwl__0: ./tests/benchmarks/32_DES_tjpcov_bm/catalogs/DESwlMETACAL_mask_zbin0_ns32.fits.gz | ||
DESwl__1: ./tests/benchmarks/32_DES_tjpcov_bm/catalogs/DESwlMETACAL_mask_zbin1_ns32.fits.gz | ||
|
||
mask_names: | ||
DESgc__0: mask_DESgc0 | ||
DESwl__0: mask_DESwl0 | ||
DESwl__1: mask_DESwl1 | ||
|
||
outdir: ./tests/tmp/ | ||
|
||
# Survey params: | ||
# 5 lens bins | ||
Ngal_DESgc__0: 26 | ||
|
||
Ngal_DESwl__0: 26 | ||
Ngal_DESwl__1: 26 | ||
# # constant bin sigma_e | ||
sigma_e_DESwl__0: 0.26 | ||
sigma_e_DESwl__1: 0.26 | ||
|
||
# linear bias for lenses constant for redshift bin (example notebook) | ||
bias_DESgc__0: 1.48 | ||
|
||
# IA: 0.5 | ||
|
||
parameters: | ||
# Not used for while (read by ccl.cosmo): | ||
Omega_c: 0.2640 | ||
Omega_b: 0.0493 | ||
h: 0.6736 | ||
n_s: 0.9649 | ||
sigma8: 0.8111 | ||
w0: -1 | ||
wa: 0 | ||
transfer_function: 'boltzmann_camb' | ||
HOD: | ||
# automatically creates massdef and concentration objects | ||
log10Mmin_0: 12.0 | ||
log10Mmin_p: 0.0 | ||
siglnM_0: 0.4 | ||
siglnM_p: 0.0 | ||
log10M0_0: 7.0 | ||
log10M0_p: 0.0 | ||
log10M1_0: 13.3 | ||
log10M1_p: 0.0 | ||
alpha_0: 1.0 | ||
alpha_p: 0.0 | ||
fc_0: 1.0 | ||
fc_p: 0.0 | ||
bg_0: 1.0 | ||
bg_p: 0.0 | ||
bmax_0: 1.0 | ||
bmax_p: 0.0 | ||
a_pivot: 1.0 | ||
ns_independent: False | ||
|
||
GaussianFsky: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since now more components apart from the Gaussian part will be using fsky, could you move this to the
(and update the other parts of the code correspondingly) |
||
fsky: 0.05 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
masks
should not be required when usingfsky
. Remove them and check that nothing breaks (I think we already tested this for the SSC)