From ef0283a663be1ef1c50c81a0253323575a038e81 Mon Sep 17 00:00:00 2001 From: Frank Siegert Date: Fri, 18 Oct 2019 14:23:36 +0200 Subject: [PATCH] Simplify Sherpa_i base fragment include structure Versioning of base fragments is not necessary anymore, because each Athena release maps exactly to one Sherpa release (i.e. only one include file would have been used anyway). The NNPDF include file will *not* include the base fragment anymore, so now JOs should read: ``` include("Sherpa_i/Base_Fragment.py") include("Sherpa_i/NNPDF30NNLO.py") [...] ``` --- .../share/common/2.2.4_Base_Fragment.py | 114 ------------------ .../share/common/2.2.4_NNPDF30NNLO.py | 5 - .../share/common/2.2.5_Base_Fragment.py | 93 -------------- .../share/common/2.2.5_NNPDF30NNLO.py | 11 -- .../share/common/2.2.6_Base_Fragment.py | 100 --------------- .../share/common/2.2.7_Base_Fragment.py | 105 ---------------- .../share/common/2.2.7_NNPDF30NNLO.py | 11 -- .../share/common/2.2.8_NNPDF30NNLO.py | 11 -- ....2.8_Base_Fragment.py => Base_Fragment.py} | 7 -- .../{2.2.6_NNPDF30NNLO.py => NNPDF30NNLO.py} | 3 - .../example/MC15.999999.Sherpa_Example.py | 3 +- 11 files changed, 2 insertions(+), 461 deletions(-) delete mode 100644 Generators/Sherpa_i/share/common/2.2.4_Base_Fragment.py delete mode 100644 Generators/Sherpa_i/share/common/2.2.4_NNPDF30NNLO.py delete mode 100644 Generators/Sherpa_i/share/common/2.2.5_Base_Fragment.py delete mode 100644 Generators/Sherpa_i/share/common/2.2.5_NNPDF30NNLO.py delete mode 100644 Generators/Sherpa_i/share/common/2.2.6_Base_Fragment.py delete mode 100644 Generators/Sherpa_i/share/common/2.2.7_Base_Fragment.py delete mode 100644 Generators/Sherpa_i/share/common/2.2.7_NNPDF30NNLO.py delete mode 100644 Generators/Sherpa_i/share/common/2.2.8_NNPDF30NNLO.py rename Generators/Sherpa_i/share/common/{2.2.8_Base_Fragment.py => Base_Fragment.py} (95%) rename Generators/Sherpa_i/share/common/{2.2.6_NNPDF30NNLO.py => NNPDF30NNLO.py} (78%) diff --git a/Generators/Sherpa_i/share/common/2.2.4_Base_Fragment.py b/Generators/Sherpa_i/share/common/2.2.4_Base_Fragment.py deleted file mode 100644 index a64916854c8..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.4_Base_Fragment.py +++ /dev/null @@ -1,114 +0,0 @@ -## Base config for Sherpa -from Sherpa_i.Sherpa_iConf import Sherpa_i -genSeq += Sherpa_i() -evgenConfig.generators = ["Sherpa"] - -# Unfortunately this is broken in TestHepMC, -# cf. https://its.cern.ch/jira/browse/AGENE-1412 -# -> disabled again -# ## Exclude status=11 and 20 particles from no-decay-vertex check -# testSeq.TestHepMC.NoDecayVertexStatuses = [1, 3, 4, 11, 20] -if hasattr(testSeq, "TestHepMC"): - testSeq.remove(TestHepMC()) - -## Tell Sherpa to read its run card sections from the jO -## TODO: write out Run.dat from genSeq.Sherpa_i.RunCard and read from it -## instead of the JO -genSeq.Sherpa_i.Parameters += [ 'RUNDATA=%s' % runArgs.jobConfig[0] ] - -## Tell Sherpa to write logs into a separate file -## (need for production, looping job detection, Wolfgang Ehrenfeld) -genSeq.Sherpa_i.Parameters += [ 'LOG_FILE=sherpa.log' ] - -## General ATLAS parameters -genSeq.Sherpa_i.Parameters += [ - "BEAM_1=2212", - "BEAM_2=2212", - "MAX_PROPER_LIFETIME=10.0", - "HEPMC_TREE_LIKE=1", - "PRETTY_PRINT=Off", - ] - -## Cap event weights at |w|<10 in unweighted evgen; set H-event shower mode -## in the soft region to avoid instable weights -genSeq.Sherpa_i.Parameters += [ - "OVERWEIGHT_THRESHOLD=10", - "PP_HPSMODE=0" -] - -## Enable scale/PDF variations by default -import os -if os.environ.has_key('LHAPATH'): - pdfgridpath = os.environ['LHAPATH'].split(":")[-1] -if not os.path.isdir(pdfgridpath): - pdfgridpath = '/cvmfs/sft.cern.ch/lcg/external/lhapdfsets/current/' - -genSeq.Sherpa_i.Parameters += [ - "HEPMC_USE_NAMED_WEIGHTS=1", - "SCALE_VARIATIONS=0.25,0.25 0.25,1. 1.,0.25 1.,1. 1.,4. 4.,1. 4.,4.", - "PDF_VARIATIONS=NNPDF30NNLO[all] NNPDF30_nnlo_as_0117 NNPDF30_nnlo_as_0119 MMHT2014nnlo68cl CT14nnlo", - "NNPDF_GRID_PATH=%s" % pdfgridpath, - ] - -## Particle masses/widths -genSeq.Sherpa_i.Parameters += [ - "MASS[6]=172.5", - "WIDTH[6]=1.32", - "MASS[15]=1.777", - "WIDTH[15]=2.26735e-12", - "MASS[23]=91.1876", - "WIDTH[23]=2.4952", - "MASS[24]=80.399", - "WIDTH[24]=2.085", - ] - -## Switch to EW_SCHEME=0 to be able to set PDG value of thetaW -genSeq.Sherpa_i.Parameters += [ - "EW_SCHEME=0", - "SIN2THETAW=0.23113", - ] - -## improve b-fragmentation (https://its.cern.ch/jira/browse/AGENE-1426) -genSeq.Sherpa_i.Parameters += [ - "SPLIT_LEADEXPONENT=1.0", - ] - -## set/add partial widths for H, W, Z to PDG values -## cf. https://sherpa.hepforge.org/doc/SHERPA-MC-2.2.4.html#HDH_005fWIDTH -genSeq.Sherpa_i.Parameters += [ - "HDH_WIDTH[6,24,5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[-6,-24,-5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[25,5,-5]=2.35e-3", - "HDH_WIDTH[25,15,-15]=2.57e-4", - "HDH_WIDTH[25,13,-13]=8.91e-7", - "HDH_WIDTH[25,4,-4]=1.18e-4", - "HDH_WIDTH[25,3,-3]=1.00e-6", - "HDH_WIDTH[25,21,21]=3.49e-4", - "HDH_WIDTH[25,22,22]=9.28e-6", - "HDH_WIDTH[24,2,-1]=0.7041", - "HDH_WIDTH[24,4,-3]=0.7041", - "HDH_WIDTH[24,12,-11]=0.2256", - "HDH_WIDTH[24,14,-13]=0.2256", - "HDH_WIDTH[24,16,-15]=0.2256", - "HDH_WIDTH[-24,-2,1]=0.7041", - "HDH_WIDTH[-24,-4,3]=0.7041", - "HDH_WIDTH[-24,-12,11]=0.2256", - "HDH_WIDTH[-24,-14,13]=0.2256", - "HDH_WIDTH[-24,-16,15]=0.2256", - "HDH_WIDTH[23,1,-1]=0.3828", - "HDH_WIDTH[23,2,-2]=0.2980", - "HDH_WIDTH[23,3,-3]=0.3828", - "HDH_WIDTH[23,4,-4]=0.2980", - "HDH_WIDTH[23,5,-5]=0.3828", - "HDH_WIDTH[23,11,-11]=0.0840", - "HDH_WIDTH[23,12,-12]=0.1663", - "HDH_WIDTH[23,13,-13]=0.0840", - "HDH_WIDTH[23,14,-14]=0.1663", - "HDH_WIDTH[23,15,-15]=0.0840", - "HDH_WIDTH[23,16,-16]=0.1663", - ] - -## OpenLoops parameters -genSeq.Sherpa_i.Parameters += [ - "OL_PARAMETERS=preset=2 write_parameters=1", - ] diff --git a/Generators/Sherpa_i/share/common/2.2.4_NNPDF30NNLO.py b/Generators/Sherpa_i/share/common/2.2.4_NNPDF30NNLO.py deleted file mode 100644 index 7960584c128..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.4_NNPDF30NNLO.py +++ /dev/null @@ -1,5 +0,0 @@ -## Sherpa config with NNPDF3.0 NNLO PDF -include("Sherpa_i/2.2.4_Base_Fragment.py") - -## NNPDF3.0 NNLO is Sherpa's default PDF/tune, thus no need to set anything up -evgenConfig.tune = "NNPDF3.0 NNLO" diff --git a/Generators/Sherpa_i/share/common/2.2.5_Base_Fragment.py b/Generators/Sherpa_i/share/common/2.2.5_Base_Fragment.py deleted file mode 100644 index 1b3e08736b1..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.5_Base_Fragment.py +++ /dev/null @@ -1,93 +0,0 @@ -## Base config for Sherpa -from Sherpa_i.Sherpa_iConf import Sherpa_i -genSeq += Sherpa_i() -evgenConfig.generators = ["Sherpa"] - -## Tell Sherpa to read its run card sections from the jO -## TODO: write out Run.dat from genSeq.Sherpa_i.RunCard and read from it -## instead of the JO -genSeq.Sherpa_i.Parameters += [ 'RUNDATA=%s' % runArgs.jobConfig[0] ] - -## Tell Sherpa to write logs into a separate file -## (need for production, looping job detection, Wolfgang Ehrenfeld) -genSeq.Sherpa_i.Parameters += [ 'LOG_FILE=sherpa.log' ] - -## General ATLAS parameters -genSeq.Sherpa_i.Parameters += [ - "BEAM_1=2212", - "BEAM_2=2212", - "MAX_PROPER_LIFETIME=10.0", - "HEPMC_TREE_LIKE=1", - "PRETTY_PRINT=Off", - ] - -## Cap event weights at |w|<10 in unweighted evgen; set H-event shower mode -## in the soft region to avoid instable weights -genSeq.Sherpa_i.Parameters += [ - "OVERWEIGHT_THRESHOLD=10", - "PP_HPSMODE=0" -] - -## Enable scale variations by default -genSeq.Sherpa_i.Parameters += [ - "HEPMC_USE_NAMED_WEIGHTS=1", - "SCALE_VARIATIONS=0.25,0.25 0.25,1. 1.,0.25 1.,1. 1.,4. 4.,1. 4.,4.", - ] - -## Particle masses/widths -genSeq.Sherpa_i.Parameters += [ - "MASS[6]=172.5", - "WIDTH[6]=1.32", - "MASS[15]=1.777", - "WIDTH[15]=2.26735e-12", - "MASS[23]=91.1876", - "WIDTH[23]=2.4952", - "MASS[24]=80.399", - "WIDTH[24]=2.085", - ] - -## Switch to EW_SCHEME=0 to be able to set PDG value of thetaW -genSeq.Sherpa_i.Parameters += [ - "EW_SCHEME=0", - "SIN2THETAW=0.23113", - ] - -## set/add partial widths for H, W, Z to PDG values -## cf. https://sherpa.hepforge.org/doc/SHERPA-MC-2.2.4.html#HDH_005fWIDTH -genSeq.Sherpa_i.Parameters += [ - "HDH_WIDTH[6,24,5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[-6,-24,-5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[25,5,-5]=2.35e-3", - "HDH_WIDTH[25,15,-15]=2.57e-4", - "HDH_WIDTH[25,13,-13]=8.91e-7", - "HDH_WIDTH[25,4,-4]=1.18e-4", - "HDH_WIDTH[25,3,-3]=1.00e-6", - "HDH_WIDTH[25,21,21]=3.49e-4", - "HDH_WIDTH[25,22,22]=9.28e-6", - "HDH_WIDTH[24,2,-1]=0.7041", - "HDH_WIDTH[24,4,-3]=0.7041", - "HDH_WIDTH[24,12,-11]=0.2256", - "HDH_WIDTH[24,14,-13]=0.2256", - "HDH_WIDTH[24,16,-15]=0.2256", - "HDH_WIDTH[-24,-2,1]=0.7041", - "HDH_WIDTH[-24,-4,3]=0.7041", - "HDH_WIDTH[-24,-12,11]=0.2256", - "HDH_WIDTH[-24,-14,13]=0.2256", - "HDH_WIDTH[-24,-16,15]=0.2256", - "HDH_WIDTH[23,1,-1]=0.3828", - "HDH_WIDTH[23,2,-2]=0.2980", - "HDH_WIDTH[23,3,-3]=0.3828", - "HDH_WIDTH[23,4,-4]=0.2980", - "HDH_WIDTH[23,5,-5]=0.3828", - "HDH_WIDTH[23,11,-11]=0.0840", - "HDH_WIDTH[23,12,-12]=0.1663", - "HDH_WIDTH[23,13,-13]=0.0840", - "HDH_WIDTH[23,14,-14]=0.1663", - "HDH_WIDTH[23,15,-15]=0.0840", - "HDH_WIDTH[23,16,-16]=0.1663", - ] - -## OpenLoops parameters -genSeq.Sherpa_i.Parameters += [ - "OL_PARAMETERS=preset=2 write_parameters=1", - ] diff --git a/Generators/Sherpa_i/share/common/2.2.5_NNPDF30NNLO.py b/Generators/Sherpa_i/share/common/2.2.5_NNPDF30NNLO.py deleted file mode 100644 index 3acf5a66ffb..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.5_NNPDF30NNLO.py +++ /dev/null @@ -1,11 +0,0 @@ -## Sherpa config with NNPDF3.0 NNLO PDF -include("Sherpa_i/2.2.5_Base_Fragment.py") - -evgenConfig.tune = "NNPDF3.0 NNLO" - -genSeq.Sherpa_i.Parameters += [ - "PDF_LIBRARY=LHAPDFSherpa", - "USE_PDF_ALPHAS=1", - "PDF_SET=NNPDF30_nnlo_as_0118", - "PDF_VARIATIONS=NNPDF30_nnlo_as_0118[all] NNPDF30_nnlo_as_0117 NNPDF30_nnlo_as_0119 MMHT2014nnlo68cl CT14nnlo PDF4LHC15_nnlo_30_pdfas[all]", - ] diff --git a/Generators/Sherpa_i/share/common/2.2.6_Base_Fragment.py b/Generators/Sherpa_i/share/common/2.2.6_Base_Fragment.py deleted file mode 100644 index e2a78c58405..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.6_Base_Fragment.py +++ /dev/null @@ -1,100 +0,0 @@ -## Base config for Sherpa -from Sherpa_i.Sherpa_iConf import Sherpa_i -genSeq += Sherpa_i() -evgenConfig.generators = ["Sherpa"] - -## Tell Sherpa to read its run card sections from the jO -## TODO: write out Run.dat from genSeq.Sherpa_i.RunCard and read from it -## instead of the JO -genSeq.Sherpa_i.Parameters += [ 'RUNDATA=%s' % runArgs.jobConfig[0] ] - -## Tell Sherpa to write logs into a separate file -## (need for production, looping job detection, Wolfgang Ehrenfeld) -genSeq.Sherpa_i.Parameters += [ 'LOG_FILE=sherpa.log' ] - -## General ATLAS parameters -genSeq.Sherpa_i.Parameters += [ - "BEAM_1=2212", - "BEAM_2=2212", - "MAX_PROPER_LIFETIME=10.0", - "HEPMC_TREE_LIKE=1", - "PRETTY_PRINT=Off", - ] - -## Cap event weights at |w|<10 in unweighted evgen; set H-event shower mode -## in the soft region to avoid instable weights -genSeq.Sherpa_i.Parameters += [ - "OVERWEIGHT_THRESHOLD=10", - "PP_HPSMODE=0" -] - -## Enable scale variations by default -genSeq.Sherpa_i.Parameters += [ - "HEPMC_USE_NAMED_WEIGHTS=1", - "SCALE_VARIATIONS=0.25,0.25 0.25,1. 1.,0.25 1.,1. 1.,4. 4.,1. 4.,4.", - ] - -## Particle masses/widths -genSeq.Sherpa_i.Parameters += [ - "MASS[6]=172.5", - "WIDTH[6]=1.32", - "MASS[15]=1.777", - "WIDTH[15]=2.26735e-12", - "MASS[23]=91.1876", - "WIDTH[23]=2.4952", - "MASS[24]=80.399", - "WIDTH[24]=2.085", - ] - -## Switch to EW_SCHEME=0 to be able to set PDG value of thetaW -genSeq.Sherpa_i.Parameters += [ - "EW_SCHEME=0", - "SIN2THETAW=0.23113", - ] - -## Add Lund hadronisation model switches from arXiv:1905.09127 -genSeq.Sherpa_i.Parameters += [ - "PARJ(21)=0.36", - "PARJ(41)=0.3", - "PARJ(42)=0.6", - ] - -## set/add partial widths for H, W, Z to PDG values -## cf. https://sherpa.hepforge.org/doc/SHERPA-MC-2.2.4.html#HDH_005fWIDTH -genSeq.Sherpa_i.Parameters += [ - "HDH_WIDTH[6,24,5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[-6,-24,-5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[25,5,-5]=2.35e-3", - "HDH_WIDTH[25,15,-15]=2.57e-4", - "HDH_WIDTH[25,13,-13]=8.91e-7", - "HDH_WIDTH[25,4,-4]=1.18e-4", - "HDH_WIDTH[25,3,-3]=1.00e-6", - "HDH_WIDTH[25,21,21]=3.49e-4", - "HDH_WIDTH[25,22,22]=9.28e-6", - "HDH_WIDTH[24,2,-1]=0.7041", - "HDH_WIDTH[24,4,-3]=0.7041", - "HDH_WIDTH[24,12,-11]=0.2256", - "HDH_WIDTH[24,14,-13]=0.2256", - "HDH_WIDTH[24,16,-15]=0.2256", - "HDH_WIDTH[-24,-2,1]=0.7041", - "HDH_WIDTH[-24,-4,3]=0.7041", - "HDH_WIDTH[-24,-12,11]=0.2256", - "HDH_WIDTH[-24,-14,13]=0.2256", - "HDH_WIDTH[-24,-16,15]=0.2256", - "HDH_WIDTH[23,1,-1]=0.3828", - "HDH_WIDTH[23,2,-2]=0.2980", - "HDH_WIDTH[23,3,-3]=0.3828", - "HDH_WIDTH[23,4,-4]=0.2980", - "HDH_WIDTH[23,5,-5]=0.3828", - "HDH_WIDTH[23,11,-11]=0.0840", - "HDH_WIDTH[23,12,-12]=0.1663", - "HDH_WIDTH[23,13,-13]=0.0840", - "HDH_WIDTH[23,14,-14]=0.1663", - "HDH_WIDTH[23,15,-15]=0.0840", - "HDH_WIDTH[23,16,-16]=0.1663", - ] - -## OpenLoops parameters -genSeq.Sherpa_i.Parameters += [ - "OL_PARAMETERS=preset=2 write_parameters=1", - ] diff --git a/Generators/Sherpa_i/share/common/2.2.7_Base_Fragment.py b/Generators/Sherpa_i/share/common/2.2.7_Base_Fragment.py deleted file mode 100644 index 7c7f2ebe0d7..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.7_Base_Fragment.py +++ /dev/null @@ -1,105 +0,0 @@ -## Base config for Sherpa -from Sherpa_i.Sherpa_iConf import Sherpa_i -genSeq += Sherpa_i() -evgenConfig.generators = ["Sherpa"] - -## Tell Sherpa to read its run card sections from the jO -## TODO: write out Run.dat from genSeq.Sherpa_i.RunCard and read from it -## instead of the JO -genSeq.Sherpa_i.Parameters += [ 'RUNDATA=%s' % runArgs.jobConfig[0] ] - -## Tell Sherpa to write logs into a separate file -## (need for production, looping job detection, Wolfgang Ehrenfeld) -genSeq.Sherpa_i.Parameters += [ 'LOG_FILE=sherpa.log' ] - -## General ATLAS parameters -genSeq.Sherpa_i.Parameters += [ - "BEAM_1=2212", - "BEAM_2=2212", - "MAX_PROPER_LIFETIME=10.0", - "HEPMC_TREE_LIKE=1", - "PRETTY_PRINT=Off", - ] - -## Cap event weights at |w|<10 in unweighted evgen; set H-event shower mode -## in the soft region to avoid instable weights -genSeq.Sherpa_i.Parameters += [ - "OVERWEIGHT_THRESHOLD=10", - "PP_HPSMODE=0" -] - -## Enable scale variations by default -genSeq.Sherpa_i.Parameters += [ - "HEPMC_USE_NAMED_WEIGHTS=1", - "CSS_REWEIGHT=1", - "REWEIGHT_SPLITTING_PDF_SCALES=1", - "REWEIGHT_SPLITTING_ALPHAS_SCALES=1", - "CSS_REWEIGHT_SCALE_CUTOFF=5.0", - "HEPMC_INCLUDE_ME_ONLY_VARIATIONS=1", - "SCALE_VARIATIONS=0.25,0.25 0.25,1. 1.,0.25 1.,1. 1.,4. 4.,1. 4.,4.", - ] - -## Particle masses/widths -genSeq.Sherpa_i.Parameters += [ - "MASS[6]=172.5", - "WIDTH[6]=1.32", - "MASS[15]=1.777", - "WIDTH[15]=2.26735e-12", - "MASS[23]=91.1876", - "WIDTH[23]=2.4952", - "MASS[24]=80.399", - "WIDTH[24]=2.085", - ] - -## Switch to EW_SCHEME=0 to be able to set PDG value of thetaW -genSeq.Sherpa_i.Parameters += [ - "EW_SCHEME=0", - "SIN2THETAW=0.23113", - ] - -## Add Lund hadronisation model switches from arXiv:1905.09127 -genSeq.Sherpa_i.Parameters += [ - "PARJ(21)=0.36", - "PARJ(41)=0.3", - "PARJ(42)=0.6", - ] - -## set/add partial widths for H, W, Z to PDG values -## cf. https://sherpa.hepforge.org/doc/SHERPA-MC-2.2.4.html#HDH_005fWIDTH -genSeq.Sherpa_i.Parameters += [ - "HDH_WIDTH[6,24,5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[-6,-24,-5]=1.32", #updated to comply latest updated top results - "HDH_WIDTH[25,5,-5]=2.35e-3", - "HDH_WIDTH[25,15,-15]=2.57e-4", - "HDH_WIDTH[25,13,-13]=8.91e-7", - "HDH_WIDTH[25,4,-4]=1.18e-4", - "HDH_WIDTH[25,3,-3]=1.00e-6", - "HDH_WIDTH[25,21,21]=3.49e-4", - "HDH_WIDTH[25,22,22]=9.28e-6", - "HDH_WIDTH[24,2,-1]=0.7041", - "HDH_WIDTH[24,4,-3]=0.7041", - "HDH_WIDTH[24,12,-11]=0.2256", - "HDH_WIDTH[24,14,-13]=0.2256", - "HDH_WIDTH[24,16,-15]=0.2256", - "HDH_WIDTH[-24,-2,1]=0.7041", - "HDH_WIDTH[-24,-4,3]=0.7041", - "HDH_WIDTH[-24,-12,11]=0.2256", - "HDH_WIDTH[-24,-14,13]=0.2256", - "HDH_WIDTH[-24,-16,15]=0.2256", - "HDH_WIDTH[23,1,-1]=0.3828", - "HDH_WIDTH[23,2,-2]=0.2980", - "HDH_WIDTH[23,3,-3]=0.3828", - "HDH_WIDTH[23,4,-4]=0.2980", - "HDH_WIDTH[23,5,-5]=0.3828", - "HDH_WIDTH[23,11,-11]=0.0840", - "HDH_WIDTH[23,12,-12]=0.1663", - "HDH_WIDTH[23,13,-13]=0.0840", - "HDH_WIDTH[23,14,-14]=0.1663", - "HDH_WIDTH[23,15,-15]=0.0840", - "HDH_WIDTH[23,16,-16]=0.1663", - ] - -## OpenLoops parameters -genSeq.Sherpa_i.Parameters += [ - "OL_PARAMETERS=preset=2 write_parameters=1", - ] diff --git a/Generators/Sherpa_i/share/common/2.2.7_NNPDF30NNLO.py b/Generators/Sherpa_i/share/common/2.2.7_NNPDF30NNLO.py deleted file mode 100644 index 28dfe1f0eee..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.7_NNPDF30NNLO.py +++ /dev/null @@ -1,11 +0,0 @@ -## Sherpa config with NNPDF3.0 NNLO PDF -include("Sherpa_i/2.2.7_Base_Fragment.py") - -evgenConfig.tune = "NNPDF3.0 NNLO" - -genSeq.Sherpa_i.Parameters += [ - "PDF_LIBRARY=LHAPDFSherpa", - "USE_PDF_ALPHAS=1", - "PDF_SET=NNPDF30_nnlo_as_0118", - "PDF_VARIATIONS=NNPDF30_nnlo_as_0118[all] NNPDF30_nnlo_as_0117 NNPDF30_nnlo_as_0119 MMHT2014nnlo68cl CT14nnlo PDF4LHC15_nnlo_30_pdfas[all]", - ] diff --git a/Generators/Sherpa_i/share/common/2.2.8_NNPDF30NNLO.py b/Generators/Sherpa_i/share/common/2.2.8_NNPDF30NNLO.py deleted file mode 100644 index cb1bcfa8509..00000000000 --- a/Generators/Sherpa_i/share/common/2.2.8_NNPDF30NNLO.py +++ /dev/null @@ -1,11 +0,0 @@ -## Sherpa config with NNPDF3.0 NNLO PDF -include("Sherpa_i/2.2.8_Base_Fragment.py") - -evgenConfig.tune = "NNPDF3.0 NNLO" - -genSeq.Sherpa_i.Parameters += [ - "PDF_LIBRARY=LHAPDFSherpa", - "USE_PDF_ALPHAS=1", - "PDF_SET=NNPDF30_nnlo_as_0118", - "PDF_VARIATIONS=NNPDF30_nnlo_as_0118[all] NNPDF30_nnlo_as_0117 NNPDF30_nnlo_as_0119 MMHT2014nnlo68cl CT14nnlo PDF4LHC15_nnlo_30_pdfas[all]", - ] diff --git a/Generators/Sherpa_i/share/common/2.2.8_Base_Fragment.py b/Generators/Sherpa_i/share/common/Base_Fragment.py similarity index 95% rename from Generators/Sherpa_i/share/common/2.2.8_Base_Fragment.py rename to Generators/Sherpa_i/share/common/Base_Fragment.py index b48c4c59b8c..3b917fa87d5 100644 --- a/Generators/Sherpa_i/share/common/2.2.8_Base_Fragment.py +++ b/Generators/Sherpa_i/share/common/Base_Fragment.py @@ -57,13 +57,6 @@ genSeq.Sherpa_i.Parameters += [ "SIN2THETAW=0.23113", ] -## Add Lund hadronisation model switches from arXiv:1905.09127 -genSeq.Sherpa_i.Parameters += [ - "PARJ(21)=0.36", - "PARJ(41)=0.3", - "PARJ(42)=0.6", - ] - ## set/add partial widths for H, W, Z to PDG values ## cf. https://sherpa.hepforge.org/doc/SHERPA-MC-2.2.4.html#HDH_005fWIDTH genSeq.Sherpa_i.Parameters += [ diff --git a/Generators/Sherpa_i/share/common/2.2.6_NNPDF30NNLO.py b/Generators/Sherpa_i/share/common/NNPDF30NNLO.py similarity index 78% rename from Generators/Sherpa_i/share/common/2.2.6_NNPDF30NNLO.py rename to Generators/Sherpa_i/share/common/NNPDF30NNLO.py index 2de1e406d07..9320e9d5070 100644 --- a/Generators/Sherpa_i/share/common/2.2.6_NNPDF30NNLO.py +++ b/Generators/Sherpa_i/share/common/NNPDF30NNLO.py @@ -1,6 +1,3 @@ -## Sherpa config with NNPDF3.0 NNLO PDF -include("Sherpa_i/2.2.6_Base_Fragment.py") - evgenConfig.tune = "NNPDF3.0 NNLO" genSeq.Sherpa_i.Parameters += [ diff --git a/Generators/Sherpa_i/share/example/MC15.999999.Sherpa_Example.py b/Generators/Sherpa_i/share/example/MC15.999999.Sherpa_Example.py index daa18d3cea5..82d1f6321d7 100644 --- a/Generators/Sherpa_i/share/example/MC15.999999.Sherpa_Example.py +++ b/Generators/Sherpa_i/share/example/MC15.999999.Sherpa_Example.py @@ -1,4 +1,5 @@ -include("Sherpa_i/2.2.7_NNPDF30NNLO.py") +include("Sherpa_i/Base_Fragment.py") +include("Sherpa_i/NNPDF30NNLO.py") evgenConfig.description = "Sherpa 2.2.x example JO, Z+0,1-jet production." evgenConfig.keywords = [ "2lepton" ] -- GitLab