Skip to content

N3LO matching#83

Merged
giacomomagni merged 101 commits into
developfrom
feature/N3LO_matching
May 11, 2022
Merged

N3LO matching#83
giacomomagni merged 101 commits into
developfrom
feature/N3LO_matching

Conversation

@giacomomagni
Copy link
Copy Markdown
Collaborator

Integrate the eko relevant features coming from #74 inside develop

@giacomomagni giacomomagni changed the title Feature/n3 lo matching N3LO matching Jan 17, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 17, 2022

Codecov Report

Merging #83 (b897e70) into develop (7a04e7e) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           develop       #83    +/-   ##
==========================================
  Coverage   100.00%   100.00%            
==========================================
  Files           36        65    +29     
  Lines         2575      3060   +485     
==========================================
+ Hits          2575      3060   +485     
Flag Coverage Δ
isobench 54.33% <52.24%> (-0.51%) ⬇️
unittests 100.00% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/eko/harmonics/f_functions/f16.py 100.00% <ø> (ø)
src/eko/matching_conditions/as3/aHg.py 100.00% <ø> (ø)
src/eko/thresholds.py 100.00% <ø> (ø)
src/eko/anomalous_dimensions/__init__.py 100.00% <100.00%> (ø)
src/eko/anomalous_dimensions/aem1.py 100.00% <100.00%> (ø)
src/eko/anomalous_dimensions/as1.py 100.00% <100.00%> (ø)
src/eko/anomalous_dimensions/as2.py 100.00% <100.00%> (ø)
src/eko/anomalous_dimensions/as3.py 100.00% <100.00%> (ø)
src/eko/beta.py 100.00% <100.00%> (ø)
src/eko/constants.py 100.00% <100.00%> (ø)
... and 46 more

@felixhekhorn felixhekhorn mentioned this pull request Jan 17, 2022
2 tasks
@felixhekhorn felixhekhorn added enhancement New feature or request physics new physics features labels Feb 11, 2022
Comment thread src/eko/matching_conditions/n3lo/__init__.py Outdated
@felixhekhorn felixhekhorn mentioned this pull request Apr 5, 2022
5 tasks
@felixhekhorn
Copy link
Copy Markdown
Collaborator

What are we missing to close this PR?

@alecandido
Copy link
Copy Markdown
Collaborator

I'm reviewing right now

Copy link
Copy Markdown
Collaborator

@alecandido alecandido left a comment

Choose a reason for hiding this comment

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

From now on, we should refrain to address multiple big tasks in a single PR:

  • the harmonics branch should have not been merged in here, because it has been reviewed twice in this way
  • the numba cache enhancement was really needed, and even related to this PR, but it has been scattered all over, blowing up the number of files, so we should have done in a separate one (and merged immediately on develop, updating afterwards this, or otherwise merge this one before, and next apply the numba chore from a second PR, we have develop branch exactly for this reason...)

P.S.: of course, I didn't check details and numbers of every single function, I checked tests and relying on them, but MMa numbers I had no way to check, just relying on you

gqq1p_cfca = -16*g3n + (132 - n*(340 + n*(655 + 51*n*(2 + n))))/(18.*np.power(n,2)*np.power(1 + n,2)) + (-14.666666666666666 + 8/n - 8/(1 + n))*S2 - (4*Sp2p)/(n + np.power(n,2)) + S1*(29.77777777777778 - 16/np.power(n,2) - 16*S2 + 8*Sp2p) + 2*Sp3p + 10*zeta3 + zeta2*(16*S1 - 16*Sp1p + 16*(1/n - np.log(2))) # pylint: disable=line-too-long
gqq1p_cfcf = 32*g3n - (8 + n*(32 + n*(40 + 3*n*(3 + n)*(3 + np.power(n,2)))))/(2.*np.power(n,3)*np.power(1 + n,3)) + (12 - 8/n + 8/(1 + n))*S2 + S1*(40/np.power(n,2) - 8/np.power(1 + n,2) + 16*S2 - 16*Sp2p) + (8*Sp2p)/(n + np.power(n,2)) - 4*Sp3p - 20*zeta3 + zeta2*(-32*S1 + 32*Sp1p + 32*(-(1/n) + np.log(2))) # pylint: disable=line-too-long
gqq1p_cfca = -16*g3n + (132 - n*(340 + n*(655 + 51*n*(2 + n))))/(18.*np.power(n,2)*np.power(1 + n,2)) + (-14.666666666666666 + 8/n - 8/(1 + n))*S2 - (4*Sp2p)/(n + np.power(n,2)) + S1*(29.77777777777778 - 16/np.power(n,2) - 16*S2 + 8*Sp2p) + 2*Sp3p + 10*zeta3 + zeta2*(16*S1 - 16*Sp1p + 16*(1/n - log2)) # pylint: disable=line-too-long
gqq1p_cfcf = 32*g3n - (8 + n*(32 + n*(40 + 3*n*(3 + n)*(3 + np.power(n,2)))))/(2.*np.power(n,3)*np.power(1 + n,3)) + (12 - 8/n + 8/(1 + n))*S2 + S1*(40/np.power(n,2) - 8/np.power(1 + n,2) + 16*S2 - 16*Sp2p) + (8*Sp2p)/(n + np.power(n,2)) - 4*Sp3p - 20*zeta3 + zeta2*(-32*S1 + 32*Sp1p + 32*(-(1/n) + log2)) # pylint: disable=line-too-long
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Okay, caching even np.log(2) it is rather extreme, but fine of course...

Comment thread src/eko/constants.py Outdated
Comment thread src/eko/mellin.py
# TODO: shall we use: 0.4 * 16.0 / (1.0 - logx) ?
self.r = 0.4 * 16.0 / (-logx)
# TODO: shall we use: 0.4 * 16.0 / ( - logx) ?
self.r = 0.4 * 16.0 / (1.0 - logx)
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I guess this has been tested, are the benefits documented somewhere? It might be useful for the future.

Consider writing something either here in the docstring, or in the Mellin page of the docs.

Comment thread tests/eko/test_g_functions.py Outdated
@alecandido
Copy link
Copy Markdown
Collaborator

The only relevant point is documenting Mellin path choice #83 (comment), but we can even postpone and just merge, at this point we have to do it as soon as possible.

@felixhekhorn felixhekhorn mentioned this pull request May 10, 2022
5 tasks
@felixhekhorn
Copy link
Copy Markdown
Collaborator

I suggest to close and instead postpone the documentation to #116

@alecandido
Copy link
Copy Markdown
Collaborator

I also updated dependencies with Poetry, so everything is alright.

I leave up to @giacomomagni the task to resolve conflicts with develop, and the pleasure to hit the green button.

@giacomomagni giacomomagni merged commit 18641bc into develop May 11, 2022
@delete-merged-branch delete-merged-branch Bot deleted the feature/N3LO_matching branch May 11, 2022 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request physics new physics features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Unify language on matching

3 participants