Merge branch 'cms-sw:master' into GGToTauTau_Inclusive

MetaData/pdflist_4f_run3.dat

@@ -0,0 +1,16 @@
+325500 NNPDF31_nnlo_as_0118_nf_4_mc_hessian 101
+320900 NNPDF31_nnlo_as_0118_nf_4 101
+320500 NNPDF31_nlo_as_0118_nf_4 1
+292400 NNPDF30_nnlo_nf_4_pdfas 103
+292000 NNPDF30_nlo_nf_4_pdfas 1
+335500 NNPDF40_nnlo_nf_4_pdfas 103
+335700 NNPDF40_nlo_nf_4_pdfas 1
+13091 CT14nnlo_NF4 1
+13191 CT14nlo_NF4 1
+13202 CT14lo_NF4 1
+27810 MSHT20nnlo_nf4 65
+27870 MSHT20nnlo_as_smallrange_nf4 3
+27610 MSHT20nlo_nf4 1
+93700 PDF4LHC21_40_pdfas_nf4 43
+42530 ABMP16_4_nnlo 30
+42930 ABMP16_4_nlo 1

MetaData/pdflist_5f_run3.dat

@@ -0,0 +1,43 @@
+325300 NNPDF31_nnlo_as_0118_mc_hessian_pdfas 103
+316200 NNPDF31_nnlo_as_0118_mc 101
+306000 NNPDF31_nnlo_hessian_pdfas 1
+322500 NNPDF31_nnlo_as_0108 1
+322700 NNPDF31_nnlo_as_0110 1
+322900 NNPDF31_nnlo_as_0112 1
+323100 NNPDF31_nnlo_as_0114 1
+323300 NNPDF31_nnlo_as_0117 1
+323500 NNPDF31_nnlo_as_0119 1
+323700 NNPDF31_nnlo_as_0122 1
+323900 NNPDF31_nnlo_as_0124 1
+305800 NNPDF31_nlo_hessian_pdfas 103
+303200 NNPDF30_nnlo_as_0118_hessian 1
+292200 NNPDF30_nlo_nf_5_pdfas 1
+331300 NNPDF40_nnlo_pdfas 103
+331600 NNPDF40_nnlo_hessian_pdfas 53
+332100 NNPDF40_nnlo_pch_as_01180 101
+332300 NNPDF40_nlo_pch_as_01180 1
+332500 NNPDF40_lo_pch_as_01180 1
+332700 NNPDF40_nnlo_as_01160 1
+332900 NNPDF40_nnlo_as_01170 1
+333100 NNPDF40_nnlo_as_01175 1
+333300 NNPDF40_nnlo_as_01185 1
+333500 NNPDF40_nnlo_as_01190 1
+333700 NNPDF40_nnlo_as_01200 1
+14000 CT18NNLO 59
+14066 CT18NNLO_as_0116 1 
+14067 CT18NNLO_as_0117 1 
+14069 CT18NNLO_as_0119 1 
+14070 CT18NNLO_as_0120 1 
+14100 CT18ZNNLO 59
+14200 CT18ANNLO 1
+14300 CT18XNNLO 1
+27400 MSHT20nnlo_as118 65
+27500 MSHT20nnlo_as_smallrange 1
+27550 MSHT20nnlo_as_largerange 1
+93300 PDF4LHC21_40_pdfas 43
+61200 HERAPDF20_NNLO_EIG 29
+42780 ABMP16als118_5_nnlo 30
+315000 NNPDF31_lo_as_0118 1
+315200 NNPDF31_lo_as_0130 1
+262000 NNPDF30_lo_as_0118 1
+263000 NNPDF30_lo_as_0130 1

Utilities/scripts/PDFSetsChooserTools.py

@@ -11,8 +11,8 @@ def readDefaultPDFsFile(self, is5FlavorScheme):
         base_dir = os.path.dirname(os.path.realpath(__file__)) 
         meta_data_dir = base_dir.replace("Utilities/scripts", "MetaData") 
 
-        self.pdflist_file = meta_data_dir + "/" + ("pdflist_5f_2017.dat" \
-            if is5FlavorScheme else "pdflist_4f_2017.dat")
+        self.pdflist_file = meta_data_dir + "/" + ("pdflist_5f_run3.dat" \
+            if is5FlavorScheme else "pdflist_4f_run3.dat")
         self.readPDFsFromFile()
 
     def readPDFsFromFile(self):

Utilities/scripts/getMG5_aMC_PDFInputs.py

@@ -4,7 +4,7 @@
 parser = argparse.ArgumentParser()
 parser.add_argument('-f', '--format', choices=['systematics', 'central', 'members', 'sets'], 
         required=True, help='Output PDF set list or list of members to store')
-parser.add_argument('-c', '--pdf_choice', choices=['custom', '2016', '2017'],
+parser.add_argument('-c', '--pdf_choice', choices=['custom', '2016', '2017', 'run3'],
         required=True, help="Use 2017 or 2016 defaults or custom choice")
 parser.add_argument('--is5FlavorScheme', action='store_true',
         help='Use PDF set for 5 flavor scheme (vs. 4F if false)')
@@ -14,26 +14,26 @@
 args = parser.parse_args()
 
 helper = PDFSetHelper_MG5_aMC()
-if args.pdf_choice == '2017':
+if args.pdf_choice == 'run3':
     helper.readDefaultPDFsFile(args.is5FlavorScheme)
 else:
     #TODO Implement option for custom PDF list
-    print "Custom sets not yet supported!"
+    print("Custom sets not yet supported!")
     exit(1)
 
 if args.format == "central":
-    print helper.getListOfLHAPDFIds(False)
+    print(helper.getListOfLHAPDFIds(False))
     exit(0)
 elif args.format == "sets":
-    print helper.getListOfLHAPDFIds(args.isNLO)
+    print(helper.getListOfLHAPDFIds(args.isNLO))
     exit(0)
 elif args.format == "members":
     # Only used for NLO 
-    print helper.getListOfMembersToStore()
+    print(helper.getListOfMembersToStore())
     exit(0)
 # Format pdf list for systematics program
 # See https://cp3.irmp.ucl.ac.be/projects/madgraph/wiki/Systematics
 elif args.format == "systematics":
-    print helper.getListOfLHAPDFIdsForSystematics()
+    print(helper.getListOfLHAPDFIdsForSystematics())
     exit(0)
 

Utilities/scripts/merge.pl

@@ -60,11 +60,13 @@
     if ($gzbytes == -1) { die("Error reading from file $infile\n"); }
     if ($gzbytes == 0)  { last; }
 
-    # Extract <MGGenerationInfo> information
+    # Extract <MGGenerationInfo> information and lhe_version
     if ($initblock == 0) {
       if ($gzline =~ s/#  Number of Events\s*:\s*(.*)\n/$1/) { $noevents = $gzline; }
       if ($gzline =~ s/#  Integrated weight \(pb\)\s*:\s*(.*)\n/$1/) { $xsec = $gzline; }
-      if ($gzline =~ s/\s*(.*)\s*=\s*lhe_version.*\n/$1/) { $lhe_version = $gzline; }
+
+      #if ($gzline =~ s/\s*(.*)\s*=\s*lhe_version.*\n/$1/) { $lhe_version = $gzline; }
+      if ($gzline =~ s/<LesHouchesEvents version=\"(.*)\">/$1/) { $lhe_version = $gzline; }
 
       # Check if we enter <init> block
       if ($gzline =~ m/$begin_init/) { $initblock++; next; }