diff --git a/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_TuneCUETP8M1_cfi.py index eccfa2766d29a..ca1b2c1ebe96a 100644 --- a/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_cfi.py b/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_cfi.py index ccf56b72f7b2d..06c8d611ce7d0 100644 --- a/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_cfi.py +++ b/Configuration/Generator/python/ADDMonoJet_13TeV_d3MD3_cfi.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/ADDMonoJet_8TeV_d3MD3_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ADDMonoJet_8TeV_d3MD3_TuneCUETP8M1_cfi.py index 8d0bd20e3f1c1..286fab3da0bf2 100644 --- a/Configuration/Generator/python/ADDMonoJet_8TeV_d3MD3_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ADDMonoJet_8TeV_d3MD3_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py b/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py new file mode 100644 index 0000000000000..6e65e6b357683 --- /dev/null +++ b/Configuration/Generator/python/AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi.py @@ -0,0 +1,57 @@ +import FWCore.ParameterSet.Config as cms + +_generator = cms.EDFilter("AMPTGeneratorFilter", + diquarky = cms.double(0.0), + diquarkx = cms.double(0.0), + diquarkpx = cms.double(7.0), + ntmax = cms.int32(1000), + dpcoal = cms.double(1000000.0), + diquarkembedding = cms.int32(0), + maxmiss = cms.int32(1000), + ktkick = cms.int32(1), + mu = cms.double(3.2264), + quenchingpar = cms.double(2.0), + popcornpar = cms.double(1.0), + drcoal = cms.double(1000000.0), + amptmode = cms.int32(1), + izpc = cms.int32(0), + popcornmode = cms.bool(True), + minijetpt = cms.double(-7.0), + ks0decay = cms.bool(False), + alpha = cms.double(0.47140452), + dt = cms.double(0.2), + rotateEventPlane = cms.bool(True), + shadowingmode = cms.bool(True), + diquarkpy = cms.double(0.0), + deuteronfactor = cms.int32(5), + stringFragB = cms.double(0.9),#default value in Hijing. Good for pA + quenchingmode = cms.bool(False), + stringFragA = cms.double(0.5), + deuteronmode = cms.int32(0), + doInitialAndFinalRadiation = cms.int32(3), + phidecay = cms.bool(True), + deuteronxsec = cms.int32(1), + pthard = cms.double(2.0), + firstRun = cms.untracked.uint32(1), + frame = cms.string('CMS'), + targ = cms.string('P'), + izp = cms.int32(82), + bMin = cms.double(0), + firstEvent = cms.untracked.uint32(1), + izt = cms.int32(1), + proj = cms.string('A'), + comEnergy = cms.double(5020.0), + iat = cms.int32(1), + bMax = cms.double(15), + iap = cms.int32(208) +) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator) + +configurationMetadata = cms.untracked.PSet( + version = cms.untracked.string('$Revision$'), + name = cms.untracked.string('$Source$'), + annotation = cms.untracked.string('AMPT PPb 5020 GeV Minimum Bias') +) + diff --git a/Configuration/Generator/python/BsToMuMu_forSTEAM_13TeV_ExtGen_cfi.py b/Configuration/Generator/python/BsToMuMu_forSTEAM_13TeV_ExtGen_cfi.py new file mode 100644 index 0000000000000..936788c9dcd3e --- /dev/null +++ b/Configuration/Generator/python/BsToMuMu_forSTEAM_13TeV_ExtGen_cfi.py @@ -0,0 +1,68 @@ +import FWCore.ParameterSet.Config as cms +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * +from GeneratorInterface.EvtGenInterface.EvtGenSetting_cff import * + +_generator = cms.EDFilter("Pythia8GeneratorFilter", + comEnergy = cms.double(13000.0), + crossSection = cms.untracked.double(54000000000), + filterEfficiency = cms.untracked.double(3.0e-4), + pythiaHepMCVerbosity = cms.untracked.bool(False), + maxEventsToPrint = cms.untracked.int32(0), + pythiaPylistVerbosity = cms.untracked.int32(0), + ExternalDecays = cms.PSet( + #using alternative name for decayer + EvtGen1 = cms.untracked.PSet( + #uses latest evt and decay tables from evtgen + decay_table = cms.string('GeneratorInterface/EvtGenInterface/data/DECAY_NOLONGLIFE.DEC'), + particle_property_file = cms.FileInPath('GeneratorInterface/EvtGenInterface/data/evt.pdl'), + convertPythiaCodes = cms.untracked.bool(False), + #here we will use the user.dec store in the release + user_decay_file = cms.vstring('GeneratorInterface/ExternalDecays/data/Bs_mumu.dec'), + list_forced_decays = cms.vstring('MyB_s0','Myanti-B_s0'), + operates_on_particles = cms.vint32() + ), + parameterSets = cms.vstring('EvtGen1') + ), + PythiaParameters = cms.PSet( + pythia8CommonSettingsBlock, + pythia8CP5SettingsBlock, + processParameters = cms.vstring( + #filter of a b-quark before hadronizing, and use a better data-like process + 'PTFilter:filter = on', + 'PTFilter:quarkToFilter = 5', + 'PTFilter:scaleToFilter = 1.0', + 'SoftQCD:nonDiffractive = on', + ), + parameterSets = cms.vstring('pythia8CommonSettings', + 'pythia8CP5Settings', + 'processParameters', + ) + ) +) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator) + +generator.PythiaParameters.processParameters.extend(EvtGenExtraParticles) + +MuMuFilter = cms.EDFilter("MCParticlePairFilter", + Status = cms.untracked.vint32(1, 1), + MinPt = cms.untracked.vdouble(3., 3.), + MaxEta = cms.untracked.vdouble(2.5, 2.5), + MinEta = cms.untracked.vdouble(-2.5, -2.5), + ParticleCharge = cms.untracked.int32(-1), + ParticleID1 = cms.untracked.vint32(13,-13), + ) + +# -- Require Muon from Bs +MuFilter = cms.EDFilter("PythiaFilter", + Status = cms.untracked.int32(1), + MotherID = cms.untracked.int32(531), + MinPt = cms.untracked.double(3.), + ParticleID = cms.untracked.int32(13), + MaxEta = cms.untracked.double(2.5), + MinEta = cms.untracked.double(-2.5) + ) + +ProductionFilterSequence = cms.Sequence(generator*MuMuFilter*MuFilter) diff --git a/Configuration/Generator/python/BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen_cfi.py b/Configuration/Generator/python/BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen_cfi.py new file mode 100644 index 0000000000000..7960f0138482d --- /dev/null +++ b/Configuration/Generator/python/BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen_cfi.py @@ -0,0 +1,106 @@ +import FWCore.ParameterSet.Config as cms +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * +from GeneratorInterface.EvtGenInterface.EvtGenSetting_cff import * + +_generator = cms.EDFilter("Pythia8GeneratorFilter", + pythiaPylistVerbosity = cms.untracked.int32(0), + pythiaHepMCVerbosity = cms.untracked.bool(False), + comEnergy = cms.double(13000.0), + maxEventsToPrint = cms.untracked.int32(0), + ExternalDecays = cms.PSet( + EvtGen130 = cms.untracked.PSet( + #uses latest evt and decay tables from evtgen + decay_table = cms.string('GeneratorInterface/EvtGenInterface/data/DECAY_NOLONGLIFE.DEC'), + particle_property_file = cms.FileInPath('GeneratorInterface/EvtGenInterface/data/evt.pdl'), + convertPythiaCodes = cms.untracked.bool(False), + #user_decay_file = cms.vstring('GeneratorInterface/ExternalDecays/data/Bu_Kstarmumu_Kspi.dec'), + #content was dump in the embed string below. This should test this feature. + list_forced_decays = cms.vstring('MyB+','MyB-'), + operates_on_particles = cms.vint32(), + user_decay_embedded= cms.vstring( + '# This is the decay file for the decay B+ -> MU+ MU- K*+(-> Ks pi+)', + '#', + '# Descriptor: [B+ -> mu+ mu- {,gamma} {,gamma} (K*+ -> Ks pi+)]cc', + '#', + '# NickName:', + '#', + '# Physics: Includes radiative mode', + '#', + '# Tested: Yes', + '# By: K. Ulmer', + '# Date: 2-26-08', + '#', + 'Alias MyB+ B+', + 'Alias MyB- B-', + 'ChargeConj MyB+ MyB-', + 'Alias MyK*+ K*+', + 'Alias MyK*- K*-', + 'ChargeConj MyK*+ MyK*-', + 'Alias MyK_S0 K_S0', + 'ChargeConj MyK_S0 MyK_S0', + '#', + 'Decay MyB+', + ' 1.000 MyK*+ mu+ mu- BTOSLLBALL;', + 'Enddecay', + 'CDecay MyB-', + '#', + 'Decay MyK*+', + ' 1.000 MyK_S0 pi+ VSS;', + 'Enddecay', + 'CDecay MyK*-', + '#', + 'Decay MyK_S0', + ' 1.000 pi+ pi- PHSP;', + 'Enddecay', + 'End' + ), + ), + parameterSets = cms.vstring('EvtGen130') + ), + PythiaParameters = cms.PSet( + pythia8CommonSettingsBlock, + pythia8CP5SettingsBlock, + processParameters = cms.vstring( + 'HardQCD:gg2bbbar = on ', + 'HardQCD:qqbar2bbbar = on ', + 'HardQCD:hardbbbar = on', + 'PhaseSpace:pTHatMin = 20.', + ), + parameterSets = cms.vstring('pythia8CommonSettings', + 'pythia8CP5Settings', + 'processParameters', + ) + ) + ) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator) + +generator.PythiaParameters.processParameters.extend(EvtGenExtraParticles) + +configurationMetadata = cms.untracked.PSet( + version = cms.untracked.string('$Revision: 1.1 $'), + name = cms.untracked.string('$Source: Configuration/Generator/python/BuToKstarMuMu_forSTEAM_13TeV_cfi.py $'), + annotation = cms.untracked.string('Summer14: Pythia8+EvtGen130 generation of Bu --> K* Mu+Mu-, 13TeV, Tune CP5') + ) + +########### +# Filters # +########### +# Filter only pp events which produce a B+: +bufilter = cms.EDFilter("PythiaFilter", ParticleID = cms.untracked.int32(521)) + +# Filter on final state muons +mumugenfilter = cms.EDFilter("MCParticlePairFilter", + Status = cms.untracked.vint32(1, 1), + MinPt = cms.untracked.vdouble(2.8, 2.8), + MinP = cms.untracked.vdouble(2.8, 2.8), + MaxEta = cms.untracked.vdouble(2.3, 2.3), + MinEta = cms.untracked.vdouble(-2.3, -2.3), + ParticleID1 = cms.untracked.vint32(13,-13), + ParticleID2 = cms.untracked.vint32(13,-13) + ) + + +ProductionFilterSequence = cms.Sequence(generator*bufilter*mumugenfilter) diff --git a/Configuration/Generator/python/BulkG_M1200_narrow_2L2Q_LHE_13TeV_cff.py b/Configuration/Generator/python/BulkG_M1200_narrow_2L2Q_LHE_13TeV_cff.py index 012fbd5cd4e4e..243ff1eb70539 100644 --- a/Configuration/Generator/python/BulkG_M1200_narrow_2L2Q_LHE_13TeV_cff.py +++ b/Configuration/Generator/python/BulkG_M1200_narrow_2L2Q_LHE_13TeV_cff.py @@ -10,5 +10,6 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/DYToLL_M-50_13TeV_pythia8_cff.py b/Configuration/Generator/python/DYToLL_M-50_13TeV_pythia8_cff.py index ad1ceb86cec57..40613ea13825b 100644 --- a/Configuration/Generator/python/DYToLL_M-50_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/DYToLL_M-50_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(6.44), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/DYToLL_M-50_14TeV_pythia8_cff.py b/Configuration/Generator/python/DYToLL_M-50_14TeV_pythia8_cff.py index 2520f4ef884b5..0b101f26d9500 100644 --- a/Configuration/Generator/python/DYToLL_M-50_14TeV_pythia8_cff.py +++ b/Configuration/Generator/python/DYToLL_M-50_14TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(14000.0), crossSection = cms.untracked.double(6.44), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/DYToll012Jets_5f_LO_MLM_Madgraph_LHE_13TeV_cff.py b/Configuration/Generator/python/DYToll012Jets_5f_LO_MLM_Madgraph_LHE_13TeV_cff.py index 67fdc7fd16773..5a8ce265714e6 100644 --- a/Configuration/Generator/python/DYToll012Jets_5f_LO_MLM_Madgraph_LHE_13TeV_cff.py +++ b/Configuration/Generator/python/DYToll012Jets_5f_LO_MLM_Madgraph_LHE_13TeV_cff.py @@ -5,5 +5,6 @@ outputFile = cms.string("cmsgrid_final.lhe"), numberOfParameters = cms.uint32(4), args = cms.vstring('/cvmfs/cms.cern.ch/phys_generator/gridpacks/UL/13TeV/madgraph/V5_2.6.5/dyellell012j_5f_LO_MLM/dyellell012j_5f_LO_MLM_slc6_amd64_gcc630_CMSSW_9_3_16_tarball.tar.xz','false','slc6_amd64_gcc630','CMSSW_9_3_16'), - nEvents = cms.untracked.uint32(10) + nEvents = cms.untracked.uint32(10), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/DarkSUSY_mH_125_mN1_60_mGammaD_10_cT_10_Madgraph_LHE_13TeV_cfi.py b/Configuration/Generator/python/DarkSUSY_mH_125_mN1_60_mGammaD_10_cT_10_Madgraph_LHE_13TeV_cfi.py index 26a43f44634af..4fc71bdfcbcdf 100644 --- a/Configuration/Generator/python/DarkSUSY_mH_125_mN1_60_mGammaD_10_cT_10_Madgraph_LHE_13TeV_cfi.py +++ b/Configuration/Generator/python/DarkSUSY_mH_125_mN1_60_mGammaD_10_cT_10_Madgraph_LHE_13TeV_cfi.py @@ -5,7 +5,8 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) #Link to datacards: diff --git a/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff.py b/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff.py index 064453f26450b..2dad86ae027a4 100644 --- a/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_300_1000mm_TuneCUETP8M1_13TeV_pythia8_cff.py @@ -757,7 +757,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_13TeV_pythia8_cff.py b/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_13TeV_pythia8_cff.py index cf7e9ec6f0473..ad9f657e7462d 100644 --- a/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_13TeV_pythia8_cff.py @@ -758,7 +758,7 @@ from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * from Configuration.Generator.PSweightsPythia.PythiaPSweightsSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_14TeV_pythia8_cff.py b/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_14TeV_pythia8_cff.py index d52aec8471eb3..8eecd4c64736a 100644 --- a/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_14TeV_pythia8_cff.py +++ b/Configuration/Generator/python/DisplacedSUSY_stopToBottom_M_800_500mm_TuneCP5_14TeV_pythia8_cff.py @@ -758,7 +758,7 @@ from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * from Configuration.Generator.PSweightsPythia.PythiaPSweightsSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/EtaBToJpsiJpsi_14TeV_TuneCP5_pythia8_cfi.py b/Configuration/Generator/python/EtaBToJpsiJpsi_14TeV_TuneCP5_pythia8_cfi.py index f49837db3d6fe..92f6cdec4da68 100644 --- a/Configuration/Generator/python/EtaBToJpsiJpsi_14TeV_TuneCP5_pythia8_cfi.py +++ b/Configuration/Generator/python/EtaBToJpsiJpsi_14TeV_TuneCP5_pythia8_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * from GeneratorInterface.EvtGenInterface.EvtGenSetting_cff import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", maxEventsToPrint = cms.untracked.int32(1), pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(0.4045), diff --git a/Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py b/Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py index 1f887fc068ed4..8b827afd949a7 100644 --- a/Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py +++ b/Configuration/Generator/python/EtaBToJpsiJpsi_forSTEAM_TuneCUEP8M1_13TeV_cfi.py @@ -2,7 +2,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", maxEventsToPrint = cms.untracked.int32(1), pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cff.py b/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cff.py index 256dad0eef046..d146b81a64f0b 100644 --- a/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cff.py +++ b/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cff.py @@ -9,6 +9,7 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cfi.py b/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cfi.py index be19bfb780025..3fbff127b2a35 100644 --- a/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cfi.py +++ b/Configuration/Generator/python/GGHZZ4L_JHUGen_Pow_NNPDF30_LHE_13TeV_cfi.py @@ -12,7 +12,8 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_cff.py b/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_cff.py index 6f2110b9288e7..489ae93671bbe 100644 --- a/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(6.44), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taupinu_cff.py b/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taupinu_cff.py index 3fb6ee3d3ed90..003623718f3ce 100644 --- a/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taupinu_cff.py +++ b/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taupinu_cff.py @@ -2,7 +2,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(6.44), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taurhonu_cff.py b/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taurhonu_cff.py index c71ae928fabbd..414a5e5752cac 100644 --- a/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taurhonu_cff.py +++ b/Configuration/Generator/python/GGToHtautau_13TeV_pythia8_taurhonu_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(6.44), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCP5_cfi.py b/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCP5_cfi.py index e5d363e086885..0a80b1448b316 100644 --- a/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py index e74b47238fa93..591f44f70fa17 100644 --- a/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/H125GGgluonfusion_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCP5_cfi.py index b2dd1adfb5837..d7b1e94280a1b 100644 --- a/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py index 263fb35457362..bd7a95fe62a65 100644 --- a/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/H125GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/H130GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H130GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py index 904e8c2bb288b..fdbbed9c735da 100644 --- a/Configuration/Generator/python/H130GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/H130GGgluonfusion_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/H130GGgluonfusion_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H130GGgluonfusion_8TeV_TuneCUETP8M1_cfi.py index 4c5e9b3f70022..0857d444b9873 100644 --- a/Configuration/Generator/python/H130GGgluonfusion_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/H130GGgluonfusion_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/H165WW2L_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H165WW2L_8TeV_TuneCUETP8M1_cfi.py index 9501fc5739225..d7413e709270f 100644 --- a/Configuration/Generator/python/H165WW2L_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/H165WW2L_8TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/H200ZZ4L_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H200ZZ4L_13TeV_TuneCUETP8M1_cfi.py index 6c163d1ab2b56..7761c64b0e97f 100644 --- a/Configuration/Generator/python/H200ZZ4L_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/H200ZZ4L_13TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/H200ZZ4L_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/H200ZZ4L_8TeV_TuneCUETP8M1_cfi.py index 6de3fd6100542..61746ac6f07aa 100644 --- a/Configuration/Generator/python/H200ZZ4L_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/H200ZZ4L_8TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_cff.py b/Configuration/Generator/python/HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_cff.py index 14dc17a365e82..96100a86ed019 100644 --- a/Configuration/Generator/python/HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/HSCPstop_M_200_TuneCUETP8M1_13TeV_pythia8_cff.py @@ -12,7 +12,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(-1), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py b/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py new file mode 100644 index 0000000000000..b4d10b568aae7 --- /dev/null +++ b/Configuration/Generator/python/Hydjet_Quenched_B12_5020GeV_ExtGen_cfi.py @@ -0,0 +1,31 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Generator.Pyquen2015Settings_cff import * + +_generator = cms.EDFilter("HydjetGeneratorFilter", + collisionParameters5020GeV, + qgpParameters, + hydjetParameters, + hydjetMode = cms.string('kHydroQJets'), + PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, + # Quarkonia and Weak Bosons added back upon dilepton group's request. + parameterSets = cms.vstring('pythiaUESettings', + 'hydjetPythiaDefault', + 'myParameters', + 'pythiaJets', + 'pythiaPromptPhotons', + 'pythiaZjets', + 'pythiaBottomoniumNRQCD', + 'pythiaCharmoniumNRQCD', + 'pythiaQuarkoniaSettings', + 'pythiaWeakBosons' + ) + ), + cFlag = cms.int32(0), + bMin = cms.double(0), + bMax = cms.double(30), + bFixed = cms.double(12) + ) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator) \ No newline at end of file diff --git a/Configuration/Generator/python/InclusiveppMuX_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/InclusiveppMuX_8TeV_TuneCUETP8M1_cfi.py index 8e3920ccc6f60..e676c404a675a 100644 --- a/Configuration/Generator/python/InclusiveppMuX_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/InclusiveppMuX_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py index 37f34a5e24dbb..739a214f521bb 100644 --- a/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_13TeV_TuneCUETP8M1_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.138), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py index 522ad64501344..cd04ad09e8f91 100644 --- a/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_14TeV_TuneCUETP8M1_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.138), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py index 497077b280fa7..7b175bfbd862d 100644 --- a/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMM_8TeV_TuneCUETP8M1_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.138), pythiaHepMCVerbosity = cms.untracked.bool(False), 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 f04318bc903ef..cc22060b845d3 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 @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * from Configuration.Generator.Pythia8CharmoniumSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.0154), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/JpsiMuMu_Pt-8_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/JpsiMuMu_Pt-8_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index 710707e361f0f..e6a59e1c47c67 100644 --- a/Configuration/Generator/python/JpsiMuMu_Pt-8_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/JpsiMuMu_Pt-8_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.026), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/MinBias_13TeV_pythia8_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/MinBias_13TeV_pythia8_TuneCUETP8M1_cfi.py index dd9253e4549f7..47377fc1bc40d 100644 --- a/Configuration/Generator/python/MinBias_13TeV_pythia8_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/MinBias_13TeV_pythia8_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/MinBias_13TeV_pythia8_cff.py b/Configuration/Generator/python/MinBias_13TeV_pythia8_cff.py index e047804ebbbb8..44dc2213ffbb3 100644 --- a/Configuration/Generator/python/MinBias_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/MinBias_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCP5_cfi.py b/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCP5_cfi.py index 75cfa58f7b907..9fbc560e7b5ee 100644 --- a/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCP5_cfi.py +++ b/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCUETP8M1_cfi.py index 0667e1bebb2e0..a721d0a43c162 100644 --- a/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/MinBias_14TeV_pythia8_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/MinBias_8TeV_pythia8_TuneCUETP8M1_cff.py b/Configuration/Generator/python/MinBias_8TeV_pythia8_TuneCUETP8M1_cff.py index d47b0715a38b9..310ffd0fa7484 100644 --- a/Configuration/Generator/python/MinBias_8TeV_pythia8_TuneCUETP8M1_cff.py +++ b/Configuration/Generator/python/MinBias_8TeV_pythia8_TuneCUETP8M1_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/MinBias_TuneCUETP8M1_13TeV_pythia8_cff.py b/Configuration/Generator/python/MinBias_TuneCUETP8M1_13TeV_pythia8_cff.py index b416e2ed685ff..ffaaab9e6cc0e 100644 --- a/Configuration/Generator/python/MinBias_TuneCUETP8M1_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/MinBias_TuneCUETP8M1_13TeV_pythia8_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", maxEventsToPrint = cms.untracked.int32(1), pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py b/Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py index 88fd27297769b..744af2ad59184 100644 --- a/Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py +++ b/Configuration/Generator/python/PYTHIA8_PhiToMuMu_TuneCUETP8M1_13TeV_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", maxEventsToPrint = cms.untracked.int32(1), pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi.py index 23c3d97b31e7a..5f72f55ea2ffd 100644 --- a/Configuration/Generator/python/PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/PhotonJet_Pt_10_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCP5_cfi.py index f4725c67d460e..d2e47ff6686b9 100644 --- a/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCUETP8M1_cfi.py index f729ee85fe98c..abbe8efadae4e 100644 --- a/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/PhotonJet_Pt_10_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/PhotonJet_Pt_10_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/PhotonJet_Pt_10_8TeV_TuneCUETP8M1_cfi.py index 5472a330b7e4a..03826a60529c2 100644 --- a/Configuration/Generator/python/PhotonJet_Pt_10_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/PhotonJet_Pt_10_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Psi2SToJPsiPiPi_14TeV_TuneCP5_pythia8_cfi.py b/Configuration/Generator/python/Psi2SToJPsiPiPi_14TeV_TuneCP5_pythia8_cfi.py index 03b89fe9f385e..5349fbdc0af3a 100644 --- a/Configuration/Generator/python/Psi2SToJPsiPiPi_14TeV_TuneCP5_pythia8_cfi.py +++ b/Configuration/Generator/python/Psi2SToJPsiPiPi_14TeV_TuneCP5_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py new file mode 100644 index 0000000000000..b81f6578e004a --- /dev/null +++ b/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi.py @@ -0,0 +1,36 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Generator.PyquenDefaultSettings_cff import * + +_generator = cms.EDFilter("PyquenGeneratorFilter", + collisionParameters, + qgpParameters, + pyquenParameters, + doQuench = cms.bool(True), + bFixed = cms.double(0.0), ## fixed impact param (fm); valid only if cflag_=0 + PythiaParameters = cms.PSet(pyquenPythiaDefaultBlock, + parameterSets = cms.vstring('pythiaUESettings','customProcesses','pythiaZjets','pythiaZtoMuonsAndElectrons','kinematics'), + kinematics = cms.vstring ("CKIN(3)=10", #min pthat + "CKIN(4)=9999", #max pthat + "CKIN(7)=-2.", #min rapidity + "CKIN(8)=2." #max rapidity + ) + + ), + cFlag = cms.int32(0), ## centrality flag + bMin = cms.double(0.0), ## min impact param (fm); valid only if cflag_!=0 + bMax = cms.double(0.0) ## max impact param (fm); valid only if cflag_!=0 + ) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator) + +_generator.embeddingMode = False + +configurationMetadata = cms.untracked.PSet( + version = cms.untracked.string('$Revision: 1.3 $'), + name = cms.untracked.string('$Source: /local/projects/CMSSW/rep/CMSSW/Configuration/Generator/python/Pyquen_ZeemumuJets_pt10_2760GeV_cfi.py,v $'), + annotation = cms.untracked.string('PYQUEN Z->mumu and Z->ee (pt-hat > 10 GeV) at sqrt(s) = 2.76TeV') + ) + +ProductionFilterSequence = cms.Sequence(generator) diff --git a/Configuration/Generator/python/Pythia8_PhotonJetpt15_20_10TeV_cff.py b/Configuration/Generator/python/Pythia8_PhotonJetpt15_20_10TeV_cff.py index d3d387cf9cfa9..45958f49988f3 100644 --- a/Configuration/Generator/python/Pythia8_PhotonJetpt15_20_10TeV_cff.py +++ b/Configuration/Generator/python/Pythia8_PhotonJetpt15_20_10TeV_cff.py @@ -2,7 +2,7 @@ ##from Configuration.Generator.PythiaUESettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/QCDForPF_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCDForPF_13TeV_TuneCUETP8M1_cfi.py index 2f0376ee68e23..083c006ba80a7 100644 --- a/Configuration/Generator/python/QCDForPF_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCDForPF_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCDForPF_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/QCDForPF_14TeV_TuneCP5_cfi.py index 68a3f3f890540..a29ebc25467dc 100644 --- a/Configuration/Generator/python/QCDForPF_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/QCDForPF_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCDForPF_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCDForPF_14TeV_TuneCUETP8M1_cfi.py index 646c726cd429d..6ad025942a5af 100644 --- a/Configuration/Generator/python/QCDForPF_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCDForPF_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCDForPF_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCDForPF_8TeV_TuneCUETP8M1_cfi.py index 6345fd177f2b4..401d87ff95ce6 100644 --- a/Configuration/Generator/python/QCDForPF_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCDForPF_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt-15To7000_TuneCUETP8M1_Flat_14TeV-pythia8_cff.py b/Configuration/Generator/python/QCD_Pt-15To7000_TuneCUETP8M1_Flat_14TeV-pythia8_cff.py index b891f4b97e3fe..0e2b075b24a65 100644 --- a/Configuration/Generator/python/QCD_Pt-15To7000_TuneCUETP8M1_Flat_14TeV-pythia8_cff.py +++ b/Configuration/Generator/python/QCD_Pt-15To7000_TuneCUETP8M1_Flat_14TeV-pythia8_cff.py @@ -4,7 +4,7 @@ from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(14000.0), crossSection = cms.untracked.double(2.0221e+09), filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_13TeV_pythia8_cff.py b/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_13TeV_pythia8_cff.py index 7ca22905e2e7c..68c1432259061 100644 --- a/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_13TeV_pythia8_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", maxEventsToPrint = cms.untracked.int32(1), pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(0.00042), diff --git a/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_14TeV_pythia8_cff.py b/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_14TeV_pythia8_cff.py index 951546046d24d..a24d3ecfea70a 100644 --- a/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_14TeV_pythia8_cff.py +++ b/Configuration/Generator/python/QCD_Pt-20toInf_MuEnrichedPt15_TuneCUETP8M1_14TeV_pythia8_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", maxEventsToPrint = cms.untracked.int32(1), pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(0.00042), diff --git a/Configuration/Generator/python/QCD_Pt15To7000_Flat_14TeV_TuneCP5_cff.py b/Configuration/Generator/python/QCD_Pt15To7000_Flat_14TeV_TuneCP5_cff.py index 60a038e4be76c..1a0136de21ddf 100644 --- a/Configuration/Generator/python/QCD_Pt15To7000_Flat_14TeV_TuneCP5_cff.py +++ b/Configuration/Generator/python/QCD_Pt15To7000_Flat_14TeV_TuneCP5_cff.py @@ -4,7 +4,7 @@ from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(14000.0), crossSection = cms.untracked.double(2.0221e+09), filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/QCD_Pt20toInf_MuEnrichedPt15_14TeV_TuneCP5_cff.py b/Configuration/Generator/python/QCD_Pt20toInf_MuEnrichedPt15_14TeV_TuneCP5_cff.py index 36d1e912bf0df..db66cd4bd43c3 100644 --- a/Configuration/Generator/python/QCD_Pt20toInf_MuEnrichedPt15_14TeV_TuneCP5_cff.py +++ b/Configuration/Generator/python/QCD_Pt20toInf_MuEnrichedPt15_14TeV_TuneCP5_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", maxEventsToPrint = cms.untracked.int32(1), pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(0.00042), diff --git a/Configuration/Generator/python/QCD_Pt_120_170_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_120_170_13TeV_TuneCUETP8M1_cfi.py index f6fa34c97571c..d28901a35cdfe 100644 --- a/Configuration/Generator/python/QCD_Pt_120_170_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_120_170_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_120_170_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_120_170_8TeV_TuneCUETP8M1_cfi.py index 7755b29b155f0..e8a30864b74bb 100644 --- a/Configuration/Generator/python/QCD_Pt_120_170_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_120_170_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_15_20_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_15_20_8TeV_TuneCUETP8M1_cfi.py index 78f774d7e8c7c..954c3996af69f 100644 --- a/Configuration/Generator/python/QCD_Pt_15_20_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_15_20_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_170_230_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_170_230_8TeV_TuneCUETP8M1_cfi.py index 831b40da414d5..1c3f52e0ce89f 100644 --- a/Configuration/Generator/python/QCD_Pt_170_230_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_170_230_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_1800_2400_13TeV_TuneCP5_cfi.py b/Configuration/Generator/python/QCD_Pt_1800_2400_13TeV_TuneCP5_cfi.py index a622e9c1ab058..c19ae06f8e454 100644 --- a/Configuration/Generator/python/QCD_Pt_1800_2400_13TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_1800_2400_13TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt_1800_2400_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/QCD_Pt_1800_2400_14TeV_TuneCP5_cfi.py index 91afc5d319358..f75b98564bb5b 100644 --- a/Configuration/Generator/python/QCD_Pt_1800_2400_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_1800_2400_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt_20_30_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_20_30_8TeV_TuneCUETP8M1_cfi.py index 4e9025a6aac5a..c0837c6eb2e59 100644 --- a/Configuration/Generator/python/QCD_Pt_20_30_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_20_30_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py index 38c6aaab7d074..b27ee99ff3d5c 100644 --- a/Configuration/Generator/python/QCD_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py index e09e7383534ca..f72a41c562cc6 100644 --- a/Configuration/Generator/python/QCD_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py index 46330e955246d..f6af723433716 100644 --- a/Configuration/Generator/python/QCD_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt_30_13TeV_pythia8_cff.py b/Configuration/Generator/python/QCD_Pt_30_13TeV_pythia8_cff.py index d9898f05e7ceb..4be3beb69f78a 100644 --- a/Configuration/Generator/python/QCD_Pt_30_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/QCD_Pt_30_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(5.72e+07), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt_30_50_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_30_50_13TeV_TuneCUETP8M1_cfi.py index a306aedc54a43..c2eb43bcb32e7 100644 --- a/Configuration/Generator/python/QCD_Pt_30_50_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_30_50_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_30_50_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_30_50_8TeV_TuneCUETP8M1_cfi.py index cccadc7516c0e..e7d358a710b50 100644 --- a/Configuration/Generator/python/QCD_Pt_30_50_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_30_50_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_30_80_BCtoE_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_30_80_BCtoE_8TeV_TuneCUETP8M1_cfi.py index 1bbf55b643ffa..06f269ebe4bda 100644 --- a/Configuration/Generator/python/QCD_Pt_30_80_BCtoE_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_30_80_BCtoE_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QCD_Pt_50_80_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_50_80_8TeV_TuneCUETP8M1_cfi.py index 9101d03939f84..573be5b005cde 100644 --- a/Configuration/Generator/python/QCD_Pt_50_80_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_50_80_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_600_800_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_600_800_13TeV_TuneCUETP8M1_cfi.py index 3609adc003fb1..e429c3030623e 100644 --- a/Configuration/Generator/python/QCD_Pt_600_800_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_600_800_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_600_800_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_600_800_14TeV_TuneCUETP8M1_cfi.py index f10b163c66827..c044543c9b718 100644 --- a/Configuration/Generator/python/QCD_Pt_600_800_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_600_800_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_600_800_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_600_800_8TeV_TuneCUETP8M1_cfi.py index eb1f5054986b3..f362186d751c6 100644 --- a/Configuration/Generator/python/QCD_Pt_600_800_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_600_800_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py index bcf6aed30dba7..7ecbfb5812301 100644 --- a/Configuration/Generator/python/QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCP5_cfi.py index 72b2178de7be1..75a45397830d8 100644 --- a/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py index 668777bd52b2c..d7177b97b7e8f 100644 --- a/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py index 56c0817d5992e..6ffa64d23a34a 100644 --- a/Configuration/Generator/python/QCD_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/QCD_Pt_80_170_BCtoE_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QCD_Pt_80_170_BCtoE_8TeV_TuneCUETP8M1_cfi.py index 77afa1e413734..5a626bed4a129 100644 --- a/Configuration/Generator/python/QCD_Pt_80_170_BCtoE_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QCD_Pt_80_170_BCtoE_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/QQH120Inv_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QQH120Inv_8TeV_TuneCUETP8M1_cfi.py index af44fd49ad985..ab9ff54fb3168 100644 --- a/Configuration/Generator/python/QQH120Inv_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QQH120Inv_8TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/QQH1352T_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QQH1352T_13TeV_TuneCUETP8M1_cfi.py index 8255ba54ce734..0d7822dbea238 100644 --- a/Configuration/Generator/python/QQH1352T_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QQH1352T_13TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/QQH1352T_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/QQH1352T_8TeV_TuneCUETP8M1_cfi.py index 89a5673f5e211..8a8cc8928a57e 100644 --- a/Configuration/Generator/python/QQH1352T_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/QQH1352T_8TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/QQToHToTauTau_mh125_TuneCP5_14TeV_pythia8_cfi.py b/Configuration/Generator/python/QQToHToTauTau_mh125_TuneCP5_14TeV_pythia8_cfi.py index 68648d19e2bd6..4f60b75d2bde0 100644 --- a/Configuration/Generator/python/QQToHToTauTau_mh125_TuneCP5_14TeV_pythia8_cfi.py +++ b/Configuration/Generator/python/QQToHToTauTau_mh125_TuneCP5_14TeV_pythia8_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), # put here the efficiency of your filter (1. if no filter) filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/RS750_quarks_and_leptons_8TeV_TuneCUETP8M1_cff.py b/Configuration/Generator/python/RS750_quarks_and_leptons_8TeV_TuneCUETP8M1_cff.py index ef55039c6aa8d..4db26dd7f60ac 100644 --- a/Configuration/Generator/python/RS750_quarks_and_leptons_8TeV_TuneCUETP8M1_cff.py +++ b/Configuration/Generator/python/RS750_quarks_and_leptons_8TeV_TuneCUETP8M1_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_cfi.py b/Configuration/Generator/python/RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_cfi.py index 88e4f9a858ae5..434df7c217e66 100644 --- a/Configuration/Generator/python/RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_cfi.py +++ b/Configuration/Generator/python/RSGravitonToGammaGamma_kMpl01_M_3000_TuneCUETP8M1_13TeV_pythia8_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(1), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_TuneCUETP8M1_cff.py b/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_TuneCUETP8M1_cff.py index 6bc8fd0ec63b7..c2377395bf0d6 100644 --- a/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_TuneCUETP8M1_cff.py +++ b/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_TuneCUETP8M1_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(1.0), pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_cff.py b/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_cff.py index e3b98fd91b6b7..dc4149d3f4bdb 100644 --- a/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_cff.py +++ b/Configuration/Generator/python/RSKKGluon_m3000GeV_13TeV_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(1.0), pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), diff --git a/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py b/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py new file mode 100644 index 0000000000000..0225adc6dc657 --- /dev/null +++ b/Configuration/Generator/python/ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi.py @@ -0,0 +1,17 @@ +import FWCore.ParameterSet.Config as cms + +_generator = cms.EDFilter("ReggeGribovPartonMCGeneratorFilter", + + bmin = cms.double(0), #impact parameter min in fm + bmax = cms.double(10000),#impact parameter max in fm + paramFileName = cms.untracked.string("Configuration/Generator/data/ReggeGribovPartonMC.param"), #file with more parameters specific to crmc interface + skipNuclFrag = cms.bool(True), #in HI collisions nuclear fragments with pt=0 can be in the hep event. to skip those activate this option + beammomentum = cms.double(4080), + targetmomentum = cms.double(-4080), + beamid = cms.int32(208), + targetid = cms.int32(1), + model = cms.int32(0), + ) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator) \ No newline at end of file diff --git a/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_13TeV-pythia8_cfi.py b/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_13TeV-pythia8_cfi.py index c7f0b156728ec..4a53d3e688faa 100644 --- a/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_13TeV-pythia8_cfi.py +++ b/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_13TeV-pythia8_cfi.py @@ -247,7 +247,7 @@ DECAY 1000035 0.00000000E+00 # neutralino4 decays """ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_TuneCP5_14TeV_pythia8_cfi.py b/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_TuneCP5_14TeV_pythia8_cfi.py index c303f50a5bb72..0e21f5399c5b0 100644 --- a/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_TuneCP5_14TeV_pythia8_cfi.py +++ b/Configuration/Generator/python/SMS-T1tttt_mGl-1500_mLSP-100_TuneCP5_14TeV_pythia8_cfi.py @@ -247,7 +247,7 @@ DECAY 1000035 0.00000000E+00 # neutralino4 decays """ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/SoftQCDDiffractive_13TeV_pythia8_cff.py b/Configuration/Generator/python/SoftQCDDiffractive_13TeV_pythia8_cff.py index f905f933f4a0f..77015a618d6de 100644 --- a/Configuration/Generator/python/SoftQCDDiffractive_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/SoftQCDDiffractive_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/SoftQCDelastic_13TeV_pythia8_cff.py b/Configuration/Generator/python/SoftQCDelastic_13TeV_pythia8_cff.py index d03797ff95a7f..c6f3c42ac2626 100644 --- a/Configuration/Generator/python/SoftQCDelastic_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/SoftQCDelastic_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/SoftQCDinelastic_13TeV_pythia8_cff.py b/Configuration/Generator/python/SoftQCDinelastic_13TeV_pythia8_cff.py index 0b6549b3804e1..1afa5e18a6131 100644 --- a/Configuration/Generator/python/SoftQCDinelastic_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/SoftQCDinelastic_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/SoftQCDnonDiffractive_13TeV_pythia8_cff.py b/Configuration/Generator/python/SoftQCDnonDiffractive_13TeV_pythia8_cff.py index 6b4b50b1838e4..948b0a5729b30 100644 --- a/Configuration/Generator/python/SoftQCDnonDiffractive_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/SoftQCDnonDiffractive_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", crossSection = cms.untracked.double(71.39e+09), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/TTbar012Jets_5f_NLO_FXFX_Madgraph_LHE_13TeV_cfi.py b/Configuration/Generator/python/TTbar012Jets_5f_NLO_FXFX_Madgraph_LHE_13TeV_cfi.py index cf4725da618d0..3128d2d78cd68 100644 --- a/Configuration/Generator/python/TTbar012Jets_5f_NLO_FXFX_Madgraph_LHE_13TeV_cfi.py +++ b/Configuration/Generator/python/TTbar012Jets_5f_NLO_FXFX_Madgraph_LHE_13TeV_cfi.py @@ -8,7 +8,8 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) #Link to datacards: diff --git a/Configuration/Generator/python/TTbarLepton_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/TTbarLepton_13TeV_TuneCUETP8M1_cfi.py index ecba70bf9500c..bf29b0affac9e 100644 --- a/Configuration/Generator/python/TTbarLepton_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/TTbarLepton_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/TTbarLepton_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/TTbarLepton_8TeV_TuneCUETP8M1_cfi.py index 52b6889a037ff..124c34db722cd 100644 --- a/Configuration/Generator/python/TTbarLepton_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/TTbarLepton_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/TTbarToDilepton_mt172p5_TuneCP5_14TeV_pythia8_cfi.py b/Configuration/Generator/python/TTbarToDilepton_mt172p5_TuneCP5_14TeV_pythia8_cfi.py index d94cb5b3caed2..7a6a8d05d77b2 100644 --- a/Configuration/Generator/python/TTbarToDilepton_mt172p5_TuneCP5_14TeV_pythia8_cfi.py +++ b/Configuration/Generator/python/TTbarToDilepton_mt172p5_TuneCP5_14TeV_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/TTbar_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/TTbar_13TeV_TuneCUETP8M1_cfi.py index 2f2a164bcfe41..23dc9ebbb35a0 100644 --- a/Configuration/Generator/python/TTbar_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/TTbar_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/TTbar_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/TTbar_14TeV_TuneCP5_cfi.py index 2adc0878812f7..156823d1b6790 100644 --- a/Configuration/Generator/python/TTbar_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/TTbar_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/TTbar_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/TTbar_14TeV_TuneCUETP8M1_cfi.py index 4cf4f54b47f94..f8c932a4c28dd 100644 --- a/Configuration/Generator/python/TTbar_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/TTbar_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/TTbar_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/TTbar_8TeV_TuneCUETP8M1_cfi.py index bdb6616c13ba6..e6962a0df592a 100644 --- a/Configuration/Generator/python/TTbar_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/TTbar_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/TauToMuMuMu_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/TauToMuMuMu_14TeV_TuneCP5_cfi.py index acab51bd844e9..9a85c27131d01 100644 --- a/Configuration/Generator/python/TauToMuMuMu_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/TauToMuMuMu_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py index 236cf933aa97c..debb3ba6e2226 100644 --- a/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * import FWCore.ParameterSet.Config as cms -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.0757), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py index 21a77bda0dc78..1e3e73ae91d42 100644 --- a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_13TeV_TuneCUETP8M1_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * from Configuration.Generator.Pythia8BottomoniumSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.53), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_14TeV_TuneCP5_cfi.py index 338f243b74140..a43ad8d24357d 100644 --- a/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/Upsilon1SToMuMu_forSTEAM_14TeV_TuneCP5_cfi.py @@ -3,7 +3,7 @@ from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * from Configuration.Generator.Pythia8BottomoniumSettings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.53), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cff.py b/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cff.py index b843ca714c6c5..3656b6c35a6ba 100644 --- a/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cff.py +++ b/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cff.py @@ -8,5 +8,6 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cfi.py b/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cfi.py index 2a6d918a81d3f..ea3435ffb8d8b 100644 --- a/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cfi.py +++ b/Configuration/Generator/python/VBFHZZ4Nu_Pow_NNPDF30_LHE_13TeV_cfi.py @@ -11,7 +11,8 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/VBFHZZ4Nu_TuneCP5_14TeV_pythia8_cfi.py b/Configuration/Generator/python/VBFHZZ4Nu_TuneCP5_14TeV_pythia8_cfi.py index 84cafcd9d62c4..d4b29e8f6e0d5 100644 --- a/Configuration/Generator/python/VBFHZZ4Nu_TuneCP5_14TeV_pythia8_cfi.py +++ b/Configuration/Generator/python/VBFHZZ4Nu_TuneCP5_14TeV_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(14000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cff.py b/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cff.py index d7918efaca278..62d5934907233 100644 --- a/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cff.py +++ b/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cff.py @@ -8,5 +8,6 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cfi.py b/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cfi.py index d4b107e50d1ba..aa5c396c252cc 100644 --- a/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cfi.py +++ b/Configuration/Generator/python/VBFHbb_Pow_NNPDF30_LHE_13TeV_cfi.py @@ -11,7 +11,8 @@ nEvents = cms.untracked.uint32(5000), numberOfParameters = cms.uint32(1), outputFile = cms.string('cmsgrid_final.lhe'), - scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh') + scriptName = cms.FileInPath('GeneratorInterface/LHEInterface/data/run_generic_tarball_cvmfs.sh'), + generateConcurrently = cms.untracked.bool(True) ) diff --git a/Configuration/Generator/python/WE_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/WE_13TeV_TuneCUETP8M1_cfi.py index 1b68a919d7bf3..1f9b60ba4bdd0 100644 --- a/Configuration/Generator/python/WE_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/WE_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/WE_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/WE_14TeV_TuneCUETP8M1_cfi.py index 9d367ff5f746f..c788251974d7f 100644 --- a/Configuration/Generator/python/WE_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/WE_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/WE_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/WE_8TeV_TuneCUETP8M1_cfi.py index 8196b6fc9ad99..b114df6e87fda 100644 --- a/Configuration/Generator/python/WE_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/WE_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/WM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/WM_13TeV_TuneCUETP8M1_cfi.py index bd9ca9538771e..11bed8b85d1dc 100644 --- a/Configuration/Generator/python/WM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/WM_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/WM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/WM_8TeV_TuneCUETP8M1_cfi.py index ab1f7675b1224..0b70bb38daa5f 100644 --- a/Configuration/Generator/python/WM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/WM_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/WToLNu_13TeV_pythia8_cff.py b/Configuration/Generator/python/WToLNu_13TeV_pythia8_cff.py index e2a2f419daa4a..d605e41ad8927 100644 --- a/Configuration/Generator/python/WToLNu_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/WToLNu_13TeV_pythia8_cff.py @@ -5,7 +5,7 @@ -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(6.44), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/WToLNu_14TeV_TuneCP5_pythia8_cfi.py b/Configuration/Generator/python/WToLNu_14TeV_TuneCP5_pythia8_cfi.py index 0ab27b9359f09..f64588a1b1f84 100644 --- a/Configuration/Generator/python/WToLNu_14TeV_TuneCP5_pythia8_cfi.py +++ b/Configuration/Generator/python/WToLNu_14TeV_TuneCP5_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/WToMuNu_14TeV_TuneCP5_pythia8_cfi.py b/Configuration/Generator/python/WToMuNu_14TeV_TuneCP5_pythia8_cfi.py index d6f2fd727959d..d33bae46c6139 100644 --- a/Configuration/Generator/python/WToMuNu_14TeV_TuneCP5_pythia8_cfi.py +++ b/Configuration/Generator/python/WToMuNu_14TeV_TuneCP5_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(1.0), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/Wjet_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Wjet_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py index a44e154070ccc..399705abccc66 100644 --- a/Configuration/Generator/python/Wjet_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Wjet_Pt_3000_3500_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Wjet_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Wjet_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py index a3402d0258d5d..9fef3ee8dc1e3 100644 --- a/Configuration/Generator/python/Wjet_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Wjet_Pt_3000_3500_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Wjet_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Wjet_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py index 46c827d6ed6b0..121c989dd5a3c 100644 --- a/Configuration/Generator/python/Wjet_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Wjet_Pt_3000_3500_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Wjet_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Wjet_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py index 76d1fc7c54a49..e609bb9a19bcb 100644 --- a/Configuration/Generator/python/Wjet_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Wjet_Pt_80_120_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Wjet_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Wjet_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py index 44d4a001e7243..40a3757878b9a 100644 --- a/Configuration/Generator/python/Wjet_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Wjet_Pt_80_120_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/Wjet_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/Wjet_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py index e6d8862d55f04..d080966ad8244 100644 --- a/Configuration/Generator/python/Wjet_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/Wjet_Pt_80_120_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/WpM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/WpM_13TeV_TuneCUETP8M1_cfi.py index a7daf31830b75..4bc78d6e92c5c 100644 --- a/Configuration/Generator/python/WpM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/WpM_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/WpM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/WpM_8TeV_TuneCUETP8M1_cfi.py index a4b411d6e49b5..8ec1fb7fe94c9 100644 --- a/Configuration/Generator/python/WpM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/WpM_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff.py b/Configuration/Generator/python/WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff.py index f3b3bf5b72fdb..2f6db18b8e8ee 100644 --- a/Configuration/Generator/python/WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff.py +++ b/Configuration/Generator/python/WprimeToENu_M-2000_TuneCUETP8M1_13TeV-pythia8_cff.py @@ -5,7 +5,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(1), filterEfficiency = cms.untracked.double(1), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/WprimeToLNu_M2000_14TeV_TuneCP5_pythia8_cfi.py b/Configuration/Generator/python/WprimeToLNu_M2000_14TeV_TuneCP5_pythia8_cfi.py index 5f3c2c32ba905..e52494c368268 100644 --- a/Configuration/Generator/python/WprimeToLNu_M2000_14TeV_TuneCP5_pythia8_cfi.py +++ b/Configuration/Generator/python/WprimeToLNu_M2000_14TeV_TuneCP5_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(1), diff --git a/Configuration/Generator/python/WprimeTolNu_M3000_13TeV_pythia8_cff.py b/Configuration/Generator/python/WprimeTolNu_M3000_13TeV_pythia8_cff.py index cebfe1a256b5c..3343d2d14c0e2 100644 --- a/Configuration/Generator/python/WprimeTolNu_M3000_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/WprimeTolNu_M3000_13TeV_pythia8_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(0.013), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/ZEEMM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZEEMM_13TeV_TuneCUETP8M1_cfi.py index d64cb3dc117fe..4a5474b7dbffe 100644 --- a/Configuration/Generator/python/ZEEMM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZEEMM_13TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZEE_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZEE_13TeV_TuneCUETP8M1_cfi.py index 85805ba09807c..67a0a3f265376 100644 --- a/Configuration/Generator/python/ZEE_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZEE_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZEE_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/ZEE_14TeV_TuneCP5_cfi.py index 309ef6743b07e..966bcbb04d7af 100644 --- a/Configuration/Generator/python/ZEE_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/ZEE_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZEE_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZEE_14TeV_TuneCUETP8M1_cfi.py index 3d8c9a19c9f0e..ca4b20cb0fa51 100644 --- a/Configuration/Generator/python/ZEE_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZEE_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZEE_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZEE_8TeV_TuneCUETP8M1_cfi.py index 654d7c12ee3f0..643accb4678d5 100644 --- a/Configuration/Generator/python/ZEE_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZEE_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZMM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZMM_13TeV_TuneCUETP8M1_cfi.py index 625ef9b224450..619e4560eb2a9 100644 --- a/Configuration/Generator/python/ZMM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZMM_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZMM_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/ZMM_14TeV_TuneCP5_cfi.py index dae81d9149055..75bda3ce3e01c 100644 --- a/Configuration/Generator/python/ZMM_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/ZMM_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZMM_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZMM_14TeV_TuneCUETP8M1_cfi.py index fd2a3735e44fa..e090854eefc81 100644 --- a/Configuration/Generator/python/ZMM_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZMM_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZMM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZMM_8TeV_TuneCUETP8M1_cfi.py index 7f18fbfa5c9cf..476454143653e 100644 --- a/Configuration/Generator/python/ZMM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZMM_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZPrime5000JJ_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZPrime5000JJ_8TeV_TuneCUETP8M1_cfi.py index 946e637bb8b70..26dc0b20ea679 100644 --- a/Configuration/Generator/python/ZPrime5000JJ_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZPrime5000JJ_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZTT_All_hadronic_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZTT_All_hadronic_13TeV_TuneCUETP8M1_cfi.py index e121555ef959e..05d4e44d5c934 100644 --- a/Configuration/Generator/python/ZTT_All_hadronic_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZTT_All_hadronic_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCP5_cfi.py index 942f178ad5432..88a3dfe88c096 100644 --- a/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCUETP8M1_cfi.py index e7ec7bfe423cf..0c34757662742 100644 --- a/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZTT_All_hadronic_14TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZTT_All_hadronic_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZTT_All_hadronic_8TeV_TuneCUETP8M1_cfi.py index b4824f236e099..040510dc48470 100644 --- a/Configuration/Generator/python/ZTT_All_hadronic_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZTT_All_hadronic_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZTT_Tauola_OneLepton_OtherHadrons_8TeV_TuneCUETP8M1_ExtGen_cfi.py b/Configuration/Generator/python/ZTT_Tauola_OneLepton_OtherHadrons_8TeV_TuneCUETP8M1_ExtGen_cfi.py new file mode 100644 index 0000000000000..4efa414036615 --- /dev/null +++ b/Configuration/Generator/python/ZTT_Tauola_OneLepton_OtherHadrons_8TeV_TuneCUETP8M1_ExtGen_cfi.py @@ -0,0 +1,40 @@ +import FWCore.ParameterSet.Config as cms +from Configuration.Generator.Pythia8CommonSettings_cfi import * +from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * +from GeneratorInterface.ExternalDecays.TauolaSettings_cff import * + +_generator = cms.EDFilter("Pythia8GeneratorFilter", + pythiaHepMCVerbosity = cms.untracked.bool(False), + maxEventsToPrint = cms.untracked.int32(0), + pythiaPylistVerbosity = cms.untracked.int32(0), + filterEfficiency = cms.untracked.double(1.0), + comEnergy = cms.double(8000.0), + ExternalDecays = cms.PSet( + Tauola = cms.untracked.PSet( + TauolaPolar, + InputCards = cms.PSet( + pjak1 = cms.int32(0), + pjak2 = cms.int32(0), + mdtau = cms.int32(214) + ), + ), + parameterSets = cms.vstring('Tauola') + ), + PythiaParameters = cms.PSet( + pythia8CommonSettingsBlock, + pythia8CUEP8M1SettingsBlock, + processParameters = cms.vstring( + 'WeakSingleBoson:ffbar2gmZ = on', + '23:onMode = off', + '23:onIfAny = 15', + 'PhaseSpace:mHatMin = 75.', + ), + parameterSets = cms.vstring('pythia8CommonSettings', + 'pythia8CUEP8M1Settings', + 'processParameters', + ) + ) + ) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator, _external_process_components_=cms.vstring("HepPDTESSource")) \ No newline at end of file diff --git a/Configuration/Generator/python/ZmumuJets_Pt_20_300_GEN_13TeV_TuneCUETP8M1_cfg.py b/Configuration/Generator/python/ZmumuJets_Pt_20_300_GEN_13TeV_TuneCUETP8M1_cfg.py index ac0806b9d21eb..3bcffa5bf479d 100644 --- a/Configuration/Generator/python/ZmumuJets_Pt_20_300_GEN_13TeV_TuneCUETP8M1_cfg.py +++ b/Configuration/Generator/python/ZmumuJets_Pt_20_300_GEN_13TeV_TuneCUETP8M1_cfg.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), maxEventsToPrint = cms.untracked.int32(0), pythiaPylistVerbosity = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpEE_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpEE_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py index c71f8e5819813..131a9fff76d7d 100644 --- a/Configuration/Generator/python/ZpEE_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpEE_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpEE_2250_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpEE_2250_13TeV_TuneCUETP8M1_cfi.py index c71f8e5819813..131a9fff76d7d 100644 --- a/Configuration/Generator/python/ZpEE_2250_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpEE_2250_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpEE_2250_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpEE_2250_8TeV_TuneCUETP8M1_cfi.py index 70c828f67a3ce..a2c141672676b 100644 --- a/Configuration/Generator/python/ZpEE_2250_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpEE_2250_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(8000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpMM_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpMM_13TeV_TuneCUETP8M1_cfi.py index 138950a1e4eb1..aa1deb9b22790 100644 --- a/Configuration/Generator/python/ZpMM_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpMM_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpMM_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpMM_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py index 5cbcd9e4eb7e1..b606e0906d648 100644 --- a/Configuration/Generator/python/ZpMM_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpMM_2250_13TeV_Tauola_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpMM_2250_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpMM_2250_13TeV_TuneCUETP8M1_cfi.py index 5cbcd9e4eb7e1..b606e0906d648 100644 --- a/Configuration/Generator/python/ZpMM_2250_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpMM_2250_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpMM_2250_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpMM_2250_8TeV_TuneCUETP8M1_cfi.py index a9bb1855a36ed..ba08583d51a03 100644 --- a/Configuration/Generator/python/ZpMM_2250_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpMM_2250_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(8000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpMM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpMM_8TeV_TuneCUETP8M1_cfi.py index d7e1d96107cd4..cf3c598d7e846 100644 --- a/Configuration/Generator/python/ZpMM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpMM_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(8000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpTT_1500_13TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpTT_1500_13TeV_TuneCUETP8M1_cfi.py index 8aa09a04bedda..abdee33185345 100644 --- a/Configuration/Generator/python/ZpTT_1500_13TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpTT_1500_13TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpTT_1500_14TeV_TuneCP5_cfi.py b/Configuration/Generator/python/ZpTT_1500_14TeV_TuneCP5_cfi.py index a0875b36c1bd0..c85e0c7061fde 100644 --- a/Configuration/Generator/python/ZpTT_1500_14TeV_TuneCP5_cfi.py +++ b/Configuration/Generator/python/ZpTT_1500_14TeV_TuneCP5_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(14000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpTT_1500_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/ZpTT_1500_8TeV_TuneCUETP8M1_cfi.py index 2dbd2b551b1d9..758a21cc4a6e7 100644 --- a/Configuration/Generator/python/ZpTT_1500_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/ZpTT_1500_8TeV_TuneCUETP8M1_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", #pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(8000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpToEE_m6000_TuneCP5_14TeV_pythia8_cfi.py b/Configuration/Generator/python/ZpToEE_m6000_TuneCP5_14TeV_pythia8_cfi.py index 30501a7412bb2..bd1dc7b2f1cac 100644 --- a/Configuration/Generator/python/ZpToEE_m6000_TuneCP5_14TeV_pythia8_cfi.py +++ b/Configuration/Generator/python/ZpToEE_m6000_TuneCP5_14TeV_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(14000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZpToMM_m6000_TuneCP5_14TeV_pythia8_cfi.py b/Configuration/Generator/python/ZpToMM_m6000_TuneCP5_14TeV_pythia8_cfi.py index d160723c7b466..c1dd5179b91e9 100644 --- a/Configuration/Generator/python/ZpToMM_m6000_TuneCP5_14TeV_pythia8_cfi.py +++ b/Configuration/Generator/python/ZpToMM_m6000_TuneCP5_14TeV_pythia8_cfi.py @@ -2,7 +2,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaHepMCVerbosity = cms.untracked.bool(False), comEnergy = cms.double(14000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/Configuration/Generator/python/ZprimeToll_M3000_13TeV_pythia8_cff.py b/Configuration/Generator/python/ZprimeToll_M3000_13TeV_pythia8_cff.py index 5752a0c94bbb9..a94aaa948cab0 100644 --- a/Configuration/Generator/python/ZprimeToll_M3000_13TeV_pythia8_cff.py +++ b/Configuration/Generator/python/ZprimeToll_M3000_13TeV_pythia8_cff.py @@ -3,7 +3,7 @@ from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.MCTunes2017.PythiaCP5Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", comEnergy = cms.double(13000.0), crossSection = cms.untracked.double(0.013), filterEfficiency = cms.untracked.double(1), diff --git a/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py index 564a2e2ead1e4..b5694d5f6132b 100644 --- a/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Generator.Pythia8CommonSettings_cfi import * from Configuration.Generator.Pythia8CUEP8M1Settings_cfi import * -generator = cms.EDFilter("Pythia8GeneratorFilter", +generator = cms.EDFilter("Pythia8ConcurrentGeneratorFilter", pythiaPylistVerbosity = cms.untracked.int32(0), filterEfficiency = cms.untracked.double(0.00013), pythiaHepMCVerbosity = cms.untracked.bool(False), diff --git a/Configuration/Generator/python/sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen_cff.py b/Configuration/Generator/python/sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen_cff.py new file mode 100644 index 0000000000000..4c6e0621f529d --- /dev/null +++ b/Configuration/Generator/python/sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen_cff.py @@ -0,0 +1,69 @@ +import FWCore.ParameterSet.Config as cms +import os + +source = cms.Source("EmptySource") + +_generator = cms.EDFilter("SherpaGeneratorFilter", + maxEventsToPrint = cms.int32(0), + filterEfficiency = cms.untracked.double(1.0), + crossSection = cms.untracked.double(-1), + SherpaProcess = cms.string('ttbar_2j_MENLOPS_13TeV'), + SherpackLocation = cms.string('/cvmfs/cms.cern.ch/phys_generator/gridpacks/slc7_amd64_gcc820/13TeV/sherpa/2.2.8'), + SherpackChecksum = cms.string('4efdf38e0d189d58c65a554ef901d027'), + FetchSherpack = cms.bool(True), + SherpaPath = cms.string('./'), + SherpaPathPiece = cms.string('./'), + SherpaResultDir = cms.string('Result'), + SherpaDefaultWeight = cms.double(1.0), + SherpaParameters = cms.PSet(parameterSets = cms.vstring( + "MPI_Cross_Sections", + "Run"), + MPI_Cross_Sections = cms.vstring( + " MPIs in Sherpa, Model = Amisic:", + " semihard xsec = 39.5554 mb,", + " non-diffractive xsec = 17.0318 mb with nd factor = 0.3142." + ), + Run = cms.vstring( + " (run){", + " CORE_SCALE TTBar;", + " METS_BBAR_MODE 5;", + " NJET:=2; LJET:=2; QCUT:=20.;", + " ME_SIGNAL_GENERATOR Comix Amegic LOOPGEN;", + " OL_PREFIX={0} ".format(os.environ['CMS_OPENLOOPS_PREFIX']), + " LOOPGEN:=OpenLoops;", + " MI_HANDLER=Amisic;", + " NLO_SMEAR_THRESHOLD 1;", + " NLO_SMEAR_POWER 2;", + " HARD_DECAYS On;", + " HARD_SPIN_CORRELATIONS=1;", + " SOFT_SPIN_CORRELATIONS=1;", + " PDF_LIBRARY LHAPDFSherpa;", + " PDF_SET NNPDF31_nnlo_hessian_pdfas;", + " USE_PDF_ALPHAS=1;", + " BEAM_1=2212; BEAM_ENERGY_1=6500;", + " BEAM_2=2212; BEAM_ENERGY_2=6500;", + " STABLE[6] 0; WIDTH[6] 0; STABLE[24] 0;", + " EXCLUSIVE_CLUSTER_MODE 1;", + " HEPMC_TREE_LIKE=1;", + " PRETTY_PRINT=Off;", + "}(run)", + " (processes){", + " Process : 93 93 -> 6 -6 93{NJET};", + " Order (*,0); CKKW sqr(QCUT/E_CMS);", + " NLO_QCD_Mode MC@NLO {LJET};", + " ME_Generator Amegic {LJET};", + " RS_ME_Generator Comix {LJET};", + " Loop_Generator LOOPGEN {LJET};", + " Integration_Error 0.05 {3,4};", + " End process;", + "}(processes)" + ), + ) +) + +from GeneratorInterface.Core.ExternalGeneratorFilter import ExternalGeneratorFilter +generator = ExternalGeneratorFilter(_generator, + _external_process_waitTime_=cms.untracked.uint32(1200), # increase the max waitTime for Sherpa + ) + +ProductionFilterSequence = cms.Sequence(generator) diff --git a/Configuration/PyReleaseValidation/python/relval_extendedgen.py b/Configuration/PyReleaseValidation/python/relval_extendedgen.py index 233578a08bab4..043a9e9e5d096 100644 --- a/Configuration/PyReleaseValidation/python/relval_extendedgen.py +++ b/Configuration/PyReleaseValidation/python/relval_extendedgen.py @@ -68,3 +68,14 @@ workflows[560]=['',['ZprimeToll_M3000_13TeV_pythia8','HARVESTGEN']] workflows[561]=['',['WprimeTolNu_M3000_13TeV_pythia8','HARVESTGEN']] workflows[562]=['BulkG_ZZ_2L2Q_M1200_narrow_13TeV_pythia8',['BulkG_M1200_narrow_2L2Q_LHE_13TeV','Hadronizer_TuneCUETP8M1_Mad_pythia8','HARVESTGEN2']] + +# ExternalGeneratorFilter +# validated GEN fragments are taken from other workflows. Annotation: generator, origin workflow id +workflows[570]=['',['BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen','HARVESTGEN']] # Pythia8+EvtGen130, 541 +workflows[571]=['',['BsToMuMu_forSTEAM_13TeV_ExtGen','HARVESTGEN']] # Pythia8+EvtGen1, 545 +workflows[572]=['',['ZTTFS_ExtGen','HARVESTGEN']] # Pythia8+Tauola, 124.2 +workflows[573]=['',['sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen','HARVESTGEN']] # Sherpa, 536 +workflows[574]=['',['HydjetQ_B12_5020GeV_2018_ExtGen','HARVESTGEN']] # Hydjet, 150 +workflows[575]=['',['AMPT_PPb_5020GeV_MinimumBias_ExtGen','HARVESTGEN']] # AMPT, 280 +workflows[576]=['',['EPOS_PPb_8160GeV_MinimumBias_ExtGen','HARVESTGEN']] # ReggeGribovPartonMC, 281 +workflows[577]=['',['Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen','HARVESTGEN']] # Pyquen, 302 diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 7b03712fafc39..4780208327d28 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1353,6 +1353,15 @@ def identityFS(wf): steps['ZprimeToll_M3000_13TeV_pythia8']=genvalid('ZprimeToll_M3000_13TeV_pythia8_cff',step1GenDefaults) steps['WprimeTolNu_M3000_13TeV_pythia8']=genvalid('WprimeTolNu_M3000_13TeV_pythia8_cff',step1GenDefaults) +steps['BsToMuMu_forSTEAM_13TeV_ExtGen']=genvalid('BsToMuMu_forSTEAM_13TeV_ExtGen_cfi',step1GenDefaults) +steps['BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen']=genvalid('BuToKstarJPsiToMuMu_forSTEAM_13TeV_ExtGen_cfi',step1GenDefaults) +steps['ZTTFS_ExtGen']=genvalid('ZTT_Tauola_OneLepton_OtherHadrons_8TeV_TuneCUETP8M1_ExtGen_cfi',step1GenDefaults) +steps['sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen']=genvalid('sherpa_ttbar_2j_MENLOPS_13TeV_MASTER_ExtGen_cff',step1GenDefaults) +steps['HydjetQ_B12_5020GeV_2018_ExtGen']=genvalid('Hydjet_Quenched_B12_5020GeV_ExtGen_cfi',step1GenDefaults) +steps['AMPT_PPb_5020GeV_MinimumBias_ExtGen']=genvalid('AMPT_PPb_5020GeV_MinimumBias_ExtGen_cfi',step1GenDefaults) +steps['EPOS_PPb_8160GeV_MinimumBias_ExtGen']=genvalid('ReggeGribovPartonMC_EposLHC_4080_4080GeV_pPb_ExtGen_cfi',step1GenDefaults) +steps['Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen']=genvalid('Pyquen_ZeemumuJets_pt10_2760GeV_ExtGen_cfi',step1GenDefaults) + # Generator Hadronization (Hadronization of LHE) steps['WJetsLNu_13TeV_madgraph-pythia8']=genvalid('Hadronizer_MgmMatchTuneCUETP8M1_13TeV_madgraph_pythia8_cff',step1GenDefaults,dataSet='/WJetsToLNu_13TeV-madgraph/Fall13wmLHE-START62_V1-v1/GEN') steps['Hadronizer_TuneCUETP8M1_13TeV_MLM_5f_max4j_LHE_pythia8']=genvalid('Hadronizer_TuneCUETP8M1_13TeV_MLM_5f_max4j_LHE_pythia8_cff',step1HadronizerDefaults)