Skip to content
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

Draft implementation of Cov NG terms #869

Merged
merged 78 commits into from
Nov 6, 2023

Conversation

carlosggarcia
Copy link
Contributor

I have started the implementation of the missing terms in the Cov NG. So far I have implemented the T^2h_13 term and checked that runs but haven't checked if the result makes sense.

I'm following Eq. 3.25 of https://arxiv.org/pdf/1912.08209.pdf

Copy link
Collaborator

@damonge damonge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good start! I think I'd leave the 2,2 part for now until we have a good idea for how to integrate over the angle...

pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/profiles_3pt.py Outdated Show resolved Hide resolved
@c-d-leonard
Copy link
Collaborator

FYI @carlosggarcia this is failing the tests due to some flake8 formatting issues. You can see them if you climb on the Details above for the continuous integration tests. Let me know if you need any help with fixing these.

@damonge damonge mentioned this pull request May 27, 2021
@carlosggarcia carlosggarcia marked this pull request as draft July 1, 2021 20:58
@c-d-leonard
Copy link
Collaborator

@carlosggarcia could we get a status update on this? :) anywhere you need help to move forward?

@carlosggarcia
Copy link
Contributor Author

carlosggarcia commented Oct 18, 2021

@c-d-leonard The update is that there's no update. I was focusing on adding NaMaster to TJPCov and now on getting it work with TXPipe. So the problem has been time, not an actual problem with the implementation!

@c-d-leonard
Copy link
Collaborator

Hi @carlosggarcia just checking whether the update is still there's no update? no worries if so :) just doing an inventory before next telecon

@carlosggarcia
Copy link
Contributor Author

@c-d-leonard I'm afraid it is. Sorry! I'll try get back to this in a few weeks.

@c-d-leonard
Copy link
Collaborator

Looks like some progress here :) @carlosggarcia any support you need on this at this point?

@carlosggarcia
Copy link
Contributor Author

@c-d-leonard, thanks for asking! @damonge is already helping me with the maths. I think that will be enough for now.

@c-d-leonard
Copy link
Collaborator

Just wondering how things are going with this at this point @carlosggarcia? No pressure, just want to check how it's going and if you need anything.

@carlosggarcia
Copy link
Contributor Author

@c-d-leonard same as two months ago. I'll try to give it a push in the next two weeks.

@carlosggarcia
Copy link
Contributor Author

Finally, this is ready for review! @damonge

@carlosggarcia carlosggarcia marked this pull request as ready for review October 25, 2023 14:58
Copy link
Collaborator

@damonge damonge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot @carlosggarcia , this is really great.

See comments below. One overall comment: the new functions in pk_4pt could be optimized by comparing profiles, and avoiding recomputing some integrals if they've been already computed (you can check out what's being done in the 1h trispectrum). If you can see an easy way of doing that now, go for it, but I'm also happy to just leave a comment and optimise this later on (since this is already a huge PR!).

pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/pk_4pt.py Outdated Show resolved Hide resolved
pyccl/halos/pk_4pt.py Outdated Show resolved Hide resolved
pyccl/halos/pk_4pt.py Outdated Show resolved Hide resolved
pyccl/halos/profiles_2pt.py Show resolved Hide resolved
pyccl/halos/profiles_2pt.py Outdated Show resolved Hide resolved
pyccl/halos/profiles_2pt.py Outdated Show resolved Hide resolved
@carlosggarcia
Copy link
Contributor Author

I have addressed the easy comments. I'll look now how to optimize it.

@carlosggarcia
Copy link
Contributor Author

back to you @damonge

pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
pyccl/halos/halo_model.py Outdated Show resolved Hide resolved
Co-authored-by: David Alonso <david.alonso@physics.ox.ac.uk>
Copy link
Collaborator

@damonge damonge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few more comments (plus remaining previous conversations)

@carlosggarcia
Copy link
Contributor Author

I think all it's done now. Back to you @damonge. Thanks for reviewing!

Copy link
Collaborator

@damonge damonge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Final comments on the tests. We're almost there!

pyccl/tests/test_hmcalculator_integrals.py Show resolved Hide resolved
pyccl/tests/test_profiles.py Outdated Show resolved Hide resolved
pyccl/tests/test_profiles.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@damonge damonge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Feel free to merge if the tests pass!

@carlosggarcia carlosggarcia mentioned this pull request Nov 6, 2023
@carlosggarcia carlosggarcia merged commit d1b104d into LSSTDESC:master Nov 6, 2023
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Halo model covariances
5 participants