Merge pull request #26 from NNPDF/fix-lumis-2

Fix remaining luminosity combinations
NNPDF · May 15, 2023 · afacfc2 · afacfc2
2 parents 00d3ec9 + 3ab9b51
commit afacfc2
Showing 1 changed file with 12 additions and 12 deletions.
diff --git 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 )
@@ -328,18 +328,18 @@ 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) {
     return - ( 
-	      vuvu * (X1.u - X1.ubar) 
-	      + 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.;
 }