From bfe13ce216e8ebad58d17b90767037cf49983ee2 Mon Sep 17 00:00:00 2001 From: Alberto Sanchez Hernandez Date: Fri, 27 Oct 2017 10:57:54 -0500 Subject: [PATCH 1/2] making cfg compatible with py8 230 -93x --- Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py | 1 + Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py | 1 + Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py | 1 + .../Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py | 1 + .../python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py | 1 + ...pBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py | 1 + ...n4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py | 1 + 7 files changed, 7 insertions(+) diff --git a/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py index 123b238244f0a..fb7fe5f554150 100644 --- a/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py @@ -19,6 +19,7 @@ 'Charmonium:O(3S1)[1S0(8)] = 0.01', 'Charmonium:O(3S1)[3P0(8)] = 0.01', 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', + 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', diff --git a/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py index d7dc525651936..b80ae85e7876b 100644 --- a/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py @@ -19,6 +19,7 @@ 'Charmonium:O(3S1)[1S0(8)] = 0.01', 'Charmonium:O(3S1)[3P0(8)] = 0.01', 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', + 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', diff --git a/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py index 7f950079d622f..7b7d84334fab0 100644 --- a/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py @@ -19,6 +19,7 @@ 'Charmonium:O(3S1)[1S0(8)] = 0.01', 'Charmonium:O(3S1)[3P0(8)] = 0.01', 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', + 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', diff --git a/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py index fea7ac074f747..9c3fafd44bb4c 100644 --- a/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py @@ -19,6 +19,7 @@ 'Charmonium:O(3S1)[1S0(8)] = 0.01', 'Charmonium:O(3S1)[3P0(8)] = 0.01', 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', + 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', diff --git a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index dd799ca853854..66c401af0d12d 100644 --- a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -19,6 +19,7 @@ 'Bottomonium:O(3S1)[1S0(8)] = 0.02', 'Bottomonium:O(3S1)[3P0(8)] = 0.02', 'Bottomonium:gg2bbbar(3S1)[3S1(1)]g = on', + 'Bottomonium:gg2bbbar(3S1)[3S1(1)]gm = on', 'Bottomonium:gg2bbbar(3S1)[3S1(8)]g = on', 'Bottomonium:qg2bbbar(3S1)[3S1(8)]q = on', 'Bottomonium:qqbar2bbbar(3S1)[3S1(8)]g = on', diff --git a/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index de3e6a0079dd8..03e86d8ecea38 100644 --- a/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -28,6 +28,7 @@ 'Bottomonium:O(3S1)[1S0(8)] = 0.02', 'Bottomonium:O(3S1)[3P0(8)] = 0.02', 'Bottomonium:gg2bbbar(3S1)[3S1(1)]g = on', + 'Bottomonium:gg2bbbar(3S1)[3S1(1)]gm = on', 'Bottomonium:gg2bbbar(3S1)[3S1(8)]g = on', 'Bottomonium:qg2bbbar(3S1)[3S1(8)]q = on', 'Bottomonium:qqbar2bbbar(3S1)[3S1(8)]g = on', diff --git a/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index beb77f3b110aa..bb4f2473c102a 100644 --- a/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -28,6 +28,7 @@ 'Bottomonium:O(3S1)[1S0(8)] = 0.02', 'Bottomonium:O(3S1)[3P0(8)] = 0.02', 'Bottomonium:gg2bbbar(3S1)[3S1(1)]g = on', + 'Bottomonium:gg2bbbar(3S1)[3S1(1)]gm = on', 'Bottomonium:gg2bbbar(3S1)[3S1(8)]g = on', 'Bottomonium:qg2bbbar(3S1)[3S1(8)]q = on', 'Bottomonium:qqbar2bbbar(3S1)[3S1(8)]g = on', From cb9eacb4d47a9cd829b428a9fd9cd83ec23ca1c7 Mon Sep 17 00:00:00 2001 From: Alberto Sanchez Hernandez Date: Wed, 1 Nov 2017 22:52:09 -0600 Subject: [PATCH 2/2] factorizing common pieces -93x --- .../python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py | 18 +++------------- .../python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py | 18 +++------------- .../python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py | 18 +++------------- .../JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py | 18 +++------------- .../python/Pythia8BottomoniumSettings_cfi.py | 21 +++++++++++++++++++ .../python/Pythia8CharmoniumSettings_cfi.py | 21 +++++++++++++++++++ ...SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py | 18 +++------------- ..._nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py | 18 +++------------- ...iToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py | 18 +++------------- 9 files changed, 63 insertions(+), 105 deletions(-) create mode 100644 Configuration/Generator/python/Pythia8BottomoniumSettings_cfi.py create mode 100644 Configuration/Generator/python/Pythia8CharmoniumSettings_cfi.py diff --git a/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py index fb7fe5f554150..37f34a5e24dbb 100644 --- a/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * generator = cms.EDFilter("Pythia8GeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), @@ -12,29 +13,16 @@ PythiaParameters = cms.PSet( pythia8CommonSettingsBlock, pythia8CUEP8M1SettingsBlock, + pythia8CharmoniumSettingsBlock, processParameters = cms.vstring( 'Charmonium:states(3S1) = 443', # filter on 443 and prevents other onium states decaying to 443, so we should turn the others off - 'Charmonium:O(3S1)[3S1(1)] = 1.16', - 'Charmonium:O(3S1)[3S1(8)] = 0.0119', - 'Charmonium:O(3S1)[1S0(8)] = 0.01', - 'Charmonium:O(3S1)[3P0(8)] = 0.01', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', - 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[1S0(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[3PJ(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3PJ(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3PJ(8)]g = on', '443:onMode = off', # ignore cross-section re-weighting (CSAMODE=6) since selecting wanted decay mode '443:onIfAny = 13', 'PhaseSpace:pTHatMin = 10.', ), parameterSets = cms.vstring('pythia8CommonSettings', 'pythia8CUEP8M1Settings', + 'pythia8CharmoniumSettings', 'processParameters', ) ) diff --git a/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py index b80ae85e7876b..522ad64501344 100644 --- a/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * generator = cms.EDFilter("Pythia8GeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), @@ -12,29 +13,16 @@ PythiaParameters = cms.PSet( pythia8CommonSettingsBlock, pythia8CUEP8M1SettingsBlock, + pythia8CharmoniumSettingsBlock, processParameters = cms.vstring( 'Charmonium:states(3S1) = 443', # filter on 443 and prevents other onium states decaying to 443, so we should turn the others off - 'Charmonium:O(3S1)[3S1(1)] = 1.16', - 'Charmonium:O(3S1)[3S1(8)] = 0.0119', - 'Charmonium:O(3S1)[1S0(8)] = 0.01', - 'Charmonium:O(3S1)[3P0(8)] = 0.01', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', - 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[1S0(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[3PJ(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3PJ(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3PJ(8)]g = on', '443:onMode = off', # ignore cross-section re-weighting (CSAMODE=6) since selecting wanted decay mode '443:onIfAny = 13', 'PhaseSpace:pTHatMin = 10.', ), parameterSets = cms.vstring('pythia8CommonSettings', 'pythia8CUEP8M1Settings', + 'pythia8CharmoniumSettings', 'processParameters', ) ) diff --git a/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py index 7b7d84334fab0..497077b280fa7 100644 --- a/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * generator = cms.EDFilter("Pythia8GeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), @@ -12,29 +13,16 @@ PythiaParameters = cms.PSet( pythia8CommonSettingsBlock, pythia8CUEP8M1SettingsBlock, + pythia8CharmoniumSettingsBlock, processParameters = cms.vstring( 'Charmonium:states(3S1) = 443 ', # filter on 443 and prevents other onium states decaying to 443, so we should turn the others off - 'Charmonium:O(3S1)[3S1(1)] = 1.16', - 'Charmonium:O(3S1)[3S1(8)] = 0.0119', - 'Charmonium:O(3S1)[1S0(8)] = 0.01', - 'Charmonium:O(3S1)[3P0(8)] = 0.01', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', - 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[1S0(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[3PJ(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3PJ(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3PJ(8)]g = on', '443:onMode = off', # ignore cross-section re-weighting (CSAMODE=6) since selecting wanted decay mode '443:onIfAny = 13', 'PhaseSpace:pTHatMin = 10.', ), parameterSets = cms.vstring('processParameters', 'pythia8CommonSettings', + 'pythia8CharmoniumSettings', 'pythia8CUEP8M1Settings', ) ) diff --git a/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py index 9c3fafd44bb4c..f04318bc903ef 100644 --- a/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_Pt_20_inf_8TeV_TuneCUETP8M1_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * generator = cms.EDFilter("Pythia8GeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), @@ -12,29 +13,16 @@ PythiaParameters = cms.PSet( pythia8CommonSettingsBlock, pythia8CUEP8M1SettingsBlock, + pythia8CharmoniumSettingsBlock, processParameters = cms.vstring( 'Charmonium:states(3S1) = 443', # filter on 443 and prevents other onium states decaying to 443, so we should turn the others off - 'Charmonium:O(3S1)[3S1(1)] = 1.16', - 'Charmonium:O(3S1)[3S1(8)] = 0.0119', - 'Charmonium:O(3S1)[1S0(8)] = 0.01', - 'Charmonium:O(3S1)[3P0(8)] = 0.01', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', - 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', - 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[1S0(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[1S0(8)]g = on', - 'Charmonium:gg2ccbar(3S1)[3PJ(8)]g = on', - 'Charmonium:qg2ccbar(3S1)[3PJ(8)]q = on', - 'Charmonium:qqbar2ccbar(3S1)[3PJ(8)]g = on', '443:onMode = off', # ignore cross-section re-weighting (CSAMODE=6) since selecting wanted decay mode '443:onIfAny = 13', 'PhaseSpace:pTHatMin = 20.', ), parameterSets = cms.vstring('pythia8CommonSettings', 'pythia8CUEP8M1Settings', + 'pythia8CharmoniumSettings', 'processParameters', ) ) diff --git a/Configuration/Generator/python/Pythia8BottomoniumSettings_cfi.py b/Configuration/Generator/python/Pythia8BottomoniumSettings_cfi.py new file mode 100644 index 0000000000000..e8030c421c6ee --- /dev/null +++ b/Configuration/Generator/python/Pythia8BottomoniumSettings_cfi.py @@ -0,0 +1,21 @@ +import FWCore.ParameterSet.Config as cms + +pythia8BottomoniumSettingsBlock = cms.PSet( + pythia8BottomoniumSettings = cms.vstring( + 'Bottomonium:O(3S1)[3S1(1)] = 9.28', + 'Bottomonium:O(3S1)[3S1(8)] = 0.15', + 'Bottomonium:O(3S1)[1S0(8)] = 0.02', + 'Bottomonium:O(3S1)[3P0(8)] = 0.02', + 'Bottomonium:gg2bbbar(3S1)[3S1(1)]g = on', + 'Bottomonium:gg2bbbar(3S1)[3S1(1)]gm = on', + 'Bottomonium:gg2bbbar(3S1)[3S1(8)]g = on', + 'Bottomonium:qg2bbbar(3S1)[3S1(8)]q = on', + 'Bottomonium:qqbar2bbbar(3S1)[3S1(8)]g = on', + 'Bottomonium:gg2bbbar(3S1)[1S0(8)]g = on', + 'Bottomonium:qg2bbbar(3S1)[1S0(8)]q = on', + 'Bottomonium:qqbar2bbbar(3S1)[1S0(8)]g = on', + 'Bottomonium:gg2bbbar(3S1)[3PJ(8)]g = on', + 'Bottomonium:qg2bbbar(3S1)[3PJ(8)]q = on', + 'Bottomonium:qqbar2bbbar(3S1)[3PJ(8)]g = on', + ) +) diff --git a/Configuration/Generator/python/Pythia8CharmoniumSettings_cfi.py b/Configuration/Generator/python/Pythia8CharmoniumSettings_cfi.py new file mode 100644 index 0000000000000..34c8b7b254e47 --- /dev/null +++ b/Configuration/Generator/python/Pythia8CharmoniumSettings_cfi.py @@ -0,0 +1,21 @@ +import FWCore.ParameterSet.Config as cms + +pythia8CharmoniumSettingsBlock = cms.PSet( + pythia8CharmoniumSettings = cms.vstring( + 'Charmonium:O(3S1)[3S1(1)] = 1.16', + 'Charmonium:O(3S1)[3S1(8)] = 0.0119', + 'Charmonium:O(3S1)[1S0(8)] = 0.01', + 'Charmonium:O(3S1)[3P0(8)] = 0.01', + 'Charmonium:gg2ccbar(3S1)[3S1(1)]g = on', + 'Charmonium:gg2ccbar(3S1)[3S1(1)]gm = on', + 'Charmonium:gg2ccbar(3S1)[3S1(8)]g = on', + 'Charmonium:qg2ccbar(3S1)[3S1(8)]q = on', + 'Charmonium:qqbar2ccbar(3S1)[3S1(8)]g = on', + 'Charmonium:gg2ccbar(3S1)[1S0(8)]g = on', + 'Charmonium:qg2ccbar(3S1)[1S0(8)]q = on', + 'Charmonium:qqbar2ccbar(3S1)[1S0(8)]g = on', + 'Charmonium:gg2ccbar(3S1)[3PJ(8)]g = on', + 'Charmonium:qg2ccbar(3S1)[3PJ(8)]q = on', + 'Charmonium:qqbar2ccbar(3S1)[3PJ(8)]g = on', + ) +) diff --git a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index 66c401af0d12d..21a77bda0dc78 100644 --- a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +from Configuration.Generator.Pythia8BottomoniumSettings_cfi import * generator = cms.EDFilter("Pythia8GeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), @@ -12,29 +13,16 @@ PythiaParameters = cms.PSet( pythia8CommonSettingsBlock, pythia8CUEP8M1SettingsBlock, + pythia8BottomoniumSettingsBlock, processParameters = cms.vstring( 'Bottomonium:states(3S1) = 553', # filter on 553 and prevents other onium states decaying to 553, so we should turn the others off - 'Bottomonium:O(3S1)[3S1(1)] = 9.28', - 'Bottomonium:O(3S1)[3S1(8)] = 0.15', - 'Bottomonium:O(3S1)[1S0(8)] = 0.02', - 'Bottomonium:O(3S1)[3P0(8)] = 0.02', - 'Bottomonium:gg2bbbar(3S1)[3S1(1)]g = on', - 'Bottomonium:gg2bbbar(3S1)[3S1(1)]gm = on', - 'Bottomonium:gg2bbbar(3S1)[3S1(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[3S1(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[3S1(8)]g = on', - 'Bottomonium:gg2bbbar(3S1)[1S0(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[1S0(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[1S0(8)]g = on', - 'Bottomonium:gg2bbbar(3S1)[3PJ(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[3PJ(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[3PJ(8)]g = on', '553:onMode = off', # ignore cross-section re-weighting (CSAMODE=6) since selecting wanted decay mode '553:onIfAny = 13', 'PhaseSpace:pTHatMin = 20.', ), parameterSets = cms.vstring('pythia8CommonSettings', 'pythia8CUEP8M1Settings', + 'pythia8BottomoniumSettings', 'processParameters', ) ) diff --git a/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index 03e86d8ecea38..9e9b8e3465382 100644 --- a/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Upsilon4sBaBarExample_BpBm_Dstarpipi_D0Kpi_nonres_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -2,6 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * from GeneratorInterface.EvtGenInterface.EvtGenSetting_cff import * +from Configuration.Generator.Pythia8BottomoniumSettings_cfi import * generator = cms.EDFilter("Pythia8GeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), @@ -21,27 +22,14 @@ PythiaParameters = cms.PSet( pythia8CommonSettingsBlock, pythia8CUEP8M1SettingsBlock, + pythia8BottomoniumSettingsBlock, processParameters = cms.vstring( 'Bottomonium:states(3S1) = 300553', - 'Bottomonium:O(3S1)[3S1(1)] = 9.28', - 'Bottomonium:O(3S1)[3S1(8)] = 0.15', - 'Bottomonium:O(3S1)[1S0(8)] = 0.02', - 'Bottomonium:O(3S1)[3P0(8)] = 0.02', - 'Bottomonium:gg2bbbar(3S1)[3S1(1)]g = on', - 'Bottomonium:gg2bbbar(3S1)[3S1(1)]gm = on', - 'Bottomonium:gg2bbbar(3S1)[3S1(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[3S1(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[3S1(8)]g = on', - 'Bottomonium:gg2bbbar(3S1)[1S0(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[1S0(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[1S0(8)]g = on', - 'Bottomonium:gg2bbbar(3S1)[3PJ(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[3PJ(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[3PJ(8)]g = on', 'PhaseSpace:pTHatMin = 20.', ), parameterSets = cms.vstring('pythia8CommonSettings', 'pythia8CUEP8M1Settings', + 'pythia8BottomoniumSettings', 'processParameters', ) ) diff --git a/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index bb4f2473c102a..1cc2f0d5e7d6e 100644 --- a/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Upsilon4swithBuToKstarJPsiToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -2,6 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * from GeneratorInterface.EvtGenInterface.EvtGenSetting_cff import * +from Configuration.Generator.Pythia8BottomoniumSettings_cfi import * generator = cms.EDFilter("Pythia8GeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), @@ -21,27 +22,14 @@ PythiaParameters = cms.PSet( pythia8CommonSettingsBlock, pythia8CUEP8M1SettingsBlock, + pythia8BottomoniumSettingsBlock, processParameters = cms.vstring( 'Bottomonium:states(3S1) = 300553', - 'Bottomonium:O(3S1)[3S1(1)] = 9.28', - 'Bottomonium:O(3S1)[3S1(8)] = 0.15', - 'Bottomonium:O(3S1)[1S0(8)] = 0.02', - 'Bottomonium:O(3S1)[3P0(8)] = 0.02', - 'Bottomonium:gg2bbbar(3S1)[3S1(1)]g = on', - 'Bottomonium:gg2bbbar(3S1)[3S1(1)]gm = on', - 'Bottomonium:gg2bbbar(3S1)[3S1(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[3S1(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[3S1(8)]g = on', - 'Bottomonium:gg2bbbar(3S1)[1S0(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[1S0(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[1S0(8)]g = on', - 'Bottomonium:gg2bbbar(3S1)[3PJ(8)]g = on', - 'Bottomonium:qg2bbbar(3S1)[3PJ(8)]q = on', - 'Bottomonium:qqbar2bbbar(3S1)[3PJ(8)]g = on', 'PhaseSpace:pTHatMin = 20.', ), parameterSets = cms.vstring('pythia8CommonSettings', 'pythia8CUEP8M1Settings', + 'pythia8BottomoniumSettings', 'processParameters', ) )