From 91981560643e2efe9135fdfe69483cbd3a3360bf Mon Sep 17 00:00:00 2001 From: Ewelina Maria Lobodzinska Date: Mon, 28 Oct 2019 14:30:28 +0000 Subject: [PATCH 1/6] [skip-ci] Update the name to mc.Sh_Example1.py --- 421xxx/421001/{mc.Sherpa_Example1.py => mc.Sh_Example1.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 421xxx/421001/{mc.Sherpa_Example1.py => mc.Sh_Example1.py} (100%) diff --git a/421xxx/421001/mc.Sherpa_Example1.py b/421xxx/421001/mc.Sh_Example1.py similarity index 100% rename from 421xxx/421001/mc.Sherpa_Example1.py rename to 421xxx/421001/mc.Sh_Example1.py -- GitLab From 0852c38533bbc09cdef1eb23e62d59515d99e4c3 Mon Sep 17 00:00:00 2001 From: Ewelina Maria Lobodzinska Date: Mon, 28 Oct 2019 14:31:30 +0000 Subject: [PATCH 2/6] [skip-ci] Update to mc.Sh_Example3.py --- 421xxx/421003/{mc.Sherpa_Example3.py => mc.Sh_Example3.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 421xxx/421003/{mc.Sherpa_Example3.py => mc.Sh_Example3.py} (100%) diff --git a/421xxx/421003/mc.Sherpa_Example3.py b/421xxx/421003/mc.Sh_Example3.py similarity index 100% rename from 421xxx/421003/mc.Sherpa_Example3.py rename to 421xxx/421003/mc.Sh_Example3.py -- GitLab From 0af64ba70c99bc4214fb764cfb71046ea2e2a6c3 Mon Sep 17 00:00:00 2001 From: Ewelina Maria Lobodzinska Date: Mon, 28 Oct 2019 14:32:38 +0000 Subject: [PATCH 3/6] [skip-ci] Update to mc.aMCH7EG_MEN30NLO_ttbar_incl_LHE.py --- ...LO_ttbar_incl_LHE.py => mc.aMCH7EG_MEN30NLO_ttbar_incl_LHE.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 421xxx/421109/{mc.aMcH7EG_MEN30NLO_ttbar_incl_LHE.py => mc.aMCH7EG_MEN30NLO_ttbar_incl_LHE.py} (100%) diff --git a/421xxx/421109/mc.aMcH7EG_MEN30NLO_ttbar_incl_LHE.py b/421xxx/421109/mc.aMCH7EG_MEN30NLO_ttbar_incl_LHE.py similarity index 100% rename from 421xxx/421109/mc.aMcH7EG_MEN30NLO_ttbar_incl_LHE.py rename to 421xxx/421109/mc.aMCH7EG_MEN30NLO_ttbar_incl_LHE.py -- GitLab From 6f3ab397fd52b24e59b83874406b87a1fef7bb7b Mon Sep 17 00:00:00 2001 From: Ewelina Maria Lobodzinska Date: Mon, 28 Oct 2019 14:40:08 +0000 Subject: [PATCH 4/6] [skip-ci] Update mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py --- ...imumuZmumu.py => mc.Pythia8B_A14NNPDF23LO_pp_JpsimumuZmumu.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 421xxx/421101/{mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py => mc.Pythia8B_A14NNPDF23LO_pp_JpsimumuZmumu.py} (100%) diff --git a/421xxx/421101/mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py b/421xxx/421101/mc.Pythia8B_A14NNPDF23LO_pp_JpsimumuZmumu.py similarity index 100% rename from 421xxx/421101/mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py rename to 421xxx/421101/mc.Pythia8B_A14NNPDF23LO_pp_JpsimumuZmumu.py -- GitLab From 34c2a3202184635e2699678fa5b3c7472b9666db Mon Sep 17 00:00:00 2001 From: "Ewelina.Maria.Lobodzinska" Date: Mon, 4 Nov 2019 11:40:25 +0100 Subject: [PATCH 6/6] [skip-ci] correct order of generators in GeneratorList, fix Sherpa ART tests --- 421xxx/421001/mc.Sh_Example1.py | 3 ++- 421xxx/421003/mc.Sh_Example3.py | 3 ++- ...simumuZmumu.py => mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py} | 0 common/GeneratorList.txt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) rename 421xxx/421101/{mc.Pythia8B_A14NNPDF23LO_pp_JpsimumuZmumu.py => mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py} (100%) diff --git a/421xxx/421001/mc.Sh_Example1.py b/421xxx/421001/mc.Sh_Example1.py index 18bc9b0e4..86ff608c9 100644 --- a/421xxx/421001/mc.Sh_Example1.py +++ b/421xxx/421001/mc.Sh_Example1.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" ] diff --git a/421xxx/421003/mc.Sh_Example3.py b/421xxx/421003/mc.Sh_Example3.py index 18bc9b0e4..86ff608c9 100644 --- a/421xxx/421003/mc.Sh_Example3.py +++ b/421xxx/421003/mc.Sh_Example3.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" ] diff --git a/421xxx/421101/mc.Pythia8B_A14NNPDF23LO_pp_JpsimumuZmumu.py b/421xxx/421101/mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py similarity index 100% rename from 421xxx/421101/mc.Pythia8B_A14NNPDF23LO_pp_JpsimumuZmumu.py rename to 421xxx/421101/mc.Py8B_A14NNPDF23LO_pp_JpsimumuZmumu.py diff --git a/common/GeneratorList.txt b/common/GeneratorList.txt index b4e1c78bd..d9b4a5e25 100644 --- a/common/GeneratorList.txt +++ b/common/GeneratorList.txt @@ -29,8 +29,8 @@ PowHel PH Powheg Ph ProtosLHEF ProtosLHEF Pyquen Pyquen +Pythia8B Py8B Pythia8 Py8 -Pythia8B Pythia8B QBH QBH QGSJet QGSJet Reldis Reldis -- GitLab