From 5b2f4b3e289d59291a76a86928cece9cb93cce99 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 22 Dec 2022 13:10:24 +0100 Subject: [PATCH 1/4] Fix remaining luminosity combinations --- src/Vlumifns_LHApdf.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Vlumifns_LHApdf.C b/src/Vlumifns_LHApdf.C index 7420765..02b2493 100644 --- a/src/Vlumifns_LHApdf.C +++ b/src/Vlumifns_LHApdf.C @@ -116,7 +116,7 @@ double qqbar_lumi(const pdfArray& X1, const pdfArray& X2, process p, collider c) + X1.b * X2.b + X1.bbar * X2.bbar ) ; } else if (c==piso) { return pref_u * ( X1.u * (X2.ubar+X2.dbar)/2. + X1.ubar * (X2.u+X2.d)/2. - + 2. * X1.c * X2.c ) + + X1.c * X2.cbar + X1.cbar * X2.c ) + pref_d * ( X1.d * (X2.dbar+X2.ubar)/2. + X1.dbar * (X2.d+X2.u)/2. + X1.s * X2.sbar + X1.sbar * X2.s + X1.b * X2.bbar + X1.bbar * X2.b ) ; } @@ -228,7 +228,7 @@ double gq_lumi(const pdfArray& X1, const pdfArray& X2, collider c){ else if ((c==pp) || (c==ppbar)) { return ( vsqasq_u * (X2.u + X2.ubar + X2.c + X2.cbar) + vsqasq_d * (X2.d + X2.dbar - + X2.s + X2.sbar + 2. * X2.b) ) + + X2.s + X2.sbar + X2.b + X2.bbar) ) * X1.gluon; } else if (c==piso) { return @@ -304,8 +304,8 @@ double qq_22_lumi(const pdfArray& X1, const pdfArray& X2, collider c){ else if ((c==pp) || (c==ppbar)){ return ( vsqasq_u * ( X2.u + X2.ubar + X2.c + X2.cbar ) + vsqasq_d * ( X2.d + X2.dbar + X2.s + X2.sbar + X2.b + X2.bbar ) ) - * ( X1.u + X1.ubar + 2.*X1.c - + X1.d + X1.dbar + X1.s + X1.sbar + 2.*X1.b ); + * ( X1.u + X1.ubar + X1.c + X1.cbar + + X1.d + X1.dbar + X1.s + X1.sbar + X1.b + X1.bbar ); } else if (c==piso){ return ( vsqasq_u * ( (X2.u + X2.ubar + X2.d + X2.dbar)/2. + X2.c + X2.cbar ) From 92ae3de5fa292e5f390f7d266406025e0302bb48 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Tue, 27 Dec 2022 12:07:52 +0100 Subject: [PATCH 2/4] Add more missing PDFs --- src/Vlumifns_LHApdf.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Vlumifns_LHApdf.C b/src/Vlumifns_LHApdf.C index 02b2493..8350d09 100644 --- a/src/Vlumifns_LHApdf.C +++ b/src/Vlumifns_LHApdf.C @@ -328,10 +328,10 @@ double qq_12_lumi(const pdfArray& X1, const pdfArray& X2, collider c){ return 0.; } double temp = - ( - vuvu * (X1.u - X1.ubar) * (X2.u - X2.ubar) - + vuvd * ( (X1.u - X1.ubar) * (X2.d - X2.dbar) - + (X1.d - X1.dbar) * (X2.u - X2.ubar) ) - + vdvd * (X1.d - X1.dbar) * (X2.d - X2.dbar) ) ; + vuvu * (X1.u - X1.ubar + X1.c - X1.cbar) * (X2.u - X2.ubar + X2.c - X2.cbar) + + vuvd * ( (X1.u - X1.ubar + X1.c - X1.cbar) * (X2.d - X2.dbar + X2.s - X2.sbar + X2.b - X2.bbar) + + (X1.d - X1.dbar + X1.s - X1.sbar + X1.b - X1.bbar) * (X2.u - X2.ubar + X2.c - X2.cbar) ) + + vdvd * (X1.d - X1.dbar + X1.s - X1.sbar + X1.b - X1.bbar) * (X2.d - X2.dbar + X2.s - X2.sbar + X2.b - X2.bbar) ) ; if (c==pp){ return temp; } else if (c==ppbar) { return - temp; } else if(c==piso) { From 5e7c627016d36c3380dbdf6c3d8631af550e342d Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Tue, 27 Dec 2022 12:08:36 +0100 Subject: [PATCH 3/4] Add a few comments --- src/Vlumifns_LHApdf.C | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Vlumifns_LHApdf.C b/src/Vlumifns_LHApdf.C index 8350d09..1dc82fd 100644 --- a/src/Vlumifns_LHApdf.C +++ b/src/Vlumifns_LHApdf.C @@ -335,8 +335,9 @@ double qq_12_lumi(const pdfArray& X1, const pdfArray& X2, collider c){ if (c==pp){ return temp; } else if (c==ppbar) { return - temp; } else if(c==piso) { + // FIXME: here are strange, charm and bottom (anti-)quark PDFs missing return - ( - vuvu * (X1.u - X1.ubar) + vuvu * (X1.u - X1.ubar) // FIXME: this line looks wrong, there are no PDFs for the second parton; wrong parentheses? + vuvd * ( (X1.u - X1.ubar + X1.d - X1.dbar) + vdvd * (X1.d - X1.dbar)) * (X2.u - X2.ubar + X2.d - X2.dbar)/2. ); From 3ab9b51253d76099a758f8c73439b28367e6acdf Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Sat, 13 May 2023 11:38:29 +0200 Subject: [PATCH 4/4] Try to fix one more bug --- src/Vlumifns_LHApdf.C | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Vlumifns_LHApdf.C b/src/Vlumifns_LHApdf.C index 1dc82fd..b37972f 100644 --- a/src/Vlumifns_LHApdf.C +++ b/src/Vlumifns_LHApdf.C @@ -335,12 +335,11 @@ double qq_12_lumi(const pdfArray& X1, const pdfArray& X2, collider c){ if (c==pp){ return temp; } else if (c==ppbar) { return - temp; } else if(c==piso) { - // FIXME: here are strange, charm and bottom (anti-)quark PDFs missing return - ( - vuvu * (X1.u - X1.ubar) // FIXME: this line looks wrong, there are no PDFs for the second parton; wrong parentheses? - + vuvd * ( (X1.u - X1.ubar + X1.d - X1.dbar) - + vdvd * (X1.d - X1.dbar)) - * (X2.u - X2.ubar + X2.d - X2.dbar)/2. ); + vuvu * (X1.u - X1.ubar + X1.c - X1.cbar) * ((X2.u - X2.ubar + X2.d - X2.dbar)/2.0 + X2.c - X2.cbar) + + vuvd * ( (X1.u - X1.ubar + X1.c - X1.cbar) * ((X2.u - X2.ubar + X2.d - X2.dbar)/2.0 + X2.s - X2.sbar + X2.b - X2.bbar) + + (X1.d - X1.dbar + X1.s - X1.sbar + X1.b - X1.bbar) * ((X2.u - X2.ubar + X2.d - X2.dbar)/2.0 + X2.c - X2.cbar) ) + + vdvd * (X1.d - X1.dbar + X1.s - X1.sbar + X1.b - X1.bbar) * ((X2.u - X2.ubar + X2.d - X2.dbar)/2.0 + X2.s - X2.sbar + X2.b - X2.bbar) ) ; } else return 0.; }