From cbde9eb49dff73e0065f7f54b0f4b0a8324be10a Mon Sep 17 00:00:00 2001 From: Zaharid Date: Thu, 22 Jun 2023 09:28:28 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Juan M. Cruz-Martinez --- validphys2/examples/pdf_lumi_plots.yaml | 2 +- validphys2/src/validphys/gridvalues.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/validphys2/examples/pdf_lumi_plots.yaml b/validphys2/examples/pdf_lumi_plots.yaml index 17764cdf07..c570249a83 100644 --- a/validphys2/examples/pdf_lumi_plots.yaml +++ b/validphys2/examples/pdf_lumi_plots.yaml @@ -14,7 +14,7 @@ sqrts: 13000 # GeV lumi_channel: "gg" # one of [gg, gq, qqbar, qq, ddbar, uubar, ssbar, # ccbar, bbbar, dubar, udbar, scbar, csbar, pp, gp, - # wlum, zlum] + # wlum1, zlum1] PDFscalespecs: - xscale: log diff --git a/validphys2/src/validphys/gridvalues.py b/validphys2/src/validphys/gridvalues.py index 62bbf3650f..96d2e3aacb 100644 --- a/validphys2/src/validphys/gridvalues.py +++ b/validphys2/src/validphys/gridvalues.py @@ -32,8 +32,8 @@ 'csbar': r'c\bar{s}', 'pp': r'\gamma\gamma', 'gp': r'g\gamma', - 'zlum': r'u\bar{u} + d\bar{d}', - 'wlum': r'u\bar{d} + d\bar{u}', + 'zlum1': r'u\bar{u} + d\bar{d}', + 'wlum1': r'u\bar{d} + d\bar{u}', } QUARK_COMBINATIONS = { @@ -166,14 +166,14 @@ def evaluate_luminosity( # as in the second of Eq.(4) in arXiv:1607.01831 res = sum(a*b for a,b in itertools.product(r1,r2)) - elif channel == 'zlum': + elif channel == 'zlum1': u, ubar = 2, -2 d, dbar = -1, 1 res = ( _parton_pair_lumi_inner(pdf_set=pdf_set, n=n, mx=mx, x1=x1, x2=x2, i=u, j=ubar) + _parton_pair_lumi_inner(pdf_set=pdf_set, n=n, mx=mx, x1=x1, x2=x2, i=d, j=dbar) ) - elif channel == 'wlum': + elif channel == 'wlum1': u, dbar = 2, -1 d, ubar = 1, -2 res = (