diff --git a/Configuration/Generator/python/Pythia8CommonSettings_cfi.py b/Configuration/Generator/python/Pythia8CommonSettings_cfi.py index 8777667cf7f68..839f26bfe6c47 100644 --- a/Configuration/Generator/python/Pythia8CommonSettings_cfi.py +++ b/Configuration/Generator/python/Pythia8CommonSettings_cfi.py @@ -9,6 +9,6 @@ 'SLHA:minMassSM = 1000.', 'ParticleDecays:limitTau0 = on', 'ParticleDecays:tau0Max = 10', - 'ParticleDecays:allowPhotonRadiation = on', + 'HadronLevel:QED = on', ) ) diff --git a/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py index debb3ba6e2226..ba51e19fa0b9e 100644 --- a/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/UpsMM_8TeV_TuneCUETP8M1_cfi.py @@ -15,7 +15,7 @@ pythia8CUEP8M1SettingsBlock, processParameters = cms.vstring( 'Bottomonium:all = on', # Quarkonia, MSEL=62 - 'ParticleDecays:allowPhotonRadiation = on', # Turn on QED FSR + 'HadronLevel:QED = on', # Turn on QED FSR 'StringFlav:mesonBvector = 3.000', # relative production vector/pseudoscalar for charm mesons - needs work 'StringFlav:mesonBL1S1J0 = 0.072', # relative scalar production (L=1,S=1,J=0)/pseudoscalar for charm mesons 'StringFlav:mesonBL1S0J1 = 3.000', # relative pseudovector production (L=1,S=0,J=1)/pseudoscalar for charm mesons diff --git a/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py b/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py index b5694d5f6132b..66f5ef46bdf57 100644 --- a/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py +++ b/Configuration/Generator/python/bJpsiX_8TeV_TuneCUETP8M1_cfi.py @@ -13,7 +13,7 @@ pythia8CUEP8M1SettingsBlock, processParameters = cms.vstring( ' Bottomonium:all = on', # Quarkonia, MSEL=61 - 'ParticleDecays:allowPhotonRadiation = on', # Turn on QED FSR + 'HadronLevel:QED = on', # Turn on QED FSR ' ParticleDecays:mixB = off', '443:onMode = off', # Turn off J/psi decays '443:onIfMatch = 13 -13' # just let J/psi -> mu+ mu- diff --git a/GeneratorInterface/EvtGenInterface/plugins/test/Py8_lambadb_evtgen1_Lb2plnuLCSR_cfg.py b/GeneratorInterface/EvtGenInterface/plugins/test/Py8_lambadb_evtgen1_Lb2plnuLCSR_cfg.py index e5397be84521b..d9678b66c8d3b 100644 --- a/GeneratorInterface/EvtGenInterface/plugins/test/Py8_lambadb_evtgen1_Lb2plnuLCSR_cfg.py +++ b/GeneratorInterface/EvtGenInterface/plugins/test/Py8_lambadb_evtgen1_Lb2plnuLCSR_cfg.py @@ -96,7 +96,7 @@ 'SLHA:minMassSM = 1000.', 'ParticleDecays:limitTau0 = on', 'ParticleDecays:tau0Max = 10', - 'ParticleDecays:allowPhotonRadiation = on') + 'HadronLevel:QED = on') ), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/GeneratorInterface/EvtGenInterface/test/Py8_bplus_evtgen1_cfg.py b/GeneratorInterface/EvtGenInterface/test/Py8_bplus_evtgen1_cfg.py index ca3f35b889e06..08dc631309246 100644 --- a/GeneratorInterface/EvtGenInterface/test/Py8_bplus_evtgen1_cfg.py +++ b/GeneratorInterface/EvtGenInterface/test/Py8_bplus_evtgen1_cfg.py @@ -122,7 +122,7 @@ 'SLHA:minMassSM = 1000.', 'ParticleDecays:limitTau0 = on', 'ParticleDecays:tau0Max = 10', - 'ParticleDecays:allowPhotonRadiation = on') + 'HadronLevel:QED = on') ), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/GeneratorInterface/EvtGenInterface/test/external_Py8_bplus_evtgen1_cfg.py b/GeneratorInterface/EvtGenInterface/test/external_Py8_bplus_evtgen1_cfg.py index c88cd20fb70bd..ceb2a1d1440f9 100644 --- a/GeneratorInterface/EvtGenInterface/test/external_Py8_bplus_evtgen1_cfg.py +++ b/GeneratorInterface/EvtGenInterface/test/external_Py8_bplus_evtgen1_cfg.py @@ -122,7 +122,7 @@ 'SLHA:minMassSM = 1000.', 'ParticleDecays:limitTau0 = on', 'ParticleDecays:tau0Max = 10', - 'ParticleDecays:allowPhotonRadiation = on') + 'HadronLevel:QED = on') ), comEnergy = cms.double(13000.0), maxEventsToPrint = cms.untracked.int32(0), diff --git a/GeneratorInterface/PhotosInterface/test/DY_7TeV_pythia8_rivet.py b/GeneratorInterface/PhotosInterface/test/DY_7TeV_pythia8_rivet.py index 6baba64cf4a5d..74ccba3530172 100644 --- a/GeneratorInterface/PhotosInterface/test/DY_7TeV_pythia8_rivet.py +++ b/GeneratorInterface/PhotosInterface/test/DY_7TeV_pythia8_rivet.py @@ -62,7 +62,7 @@ parameterSets = cms.vstring("Photospp") ) process.generator.PythiaParameters.processParameters += cms.vstring( - 'ParticleDecays:allowPhotonRadiation = off', + 'HadronLevel:QED = off', 'TimeShower:QEDshowerByL = off', ) @@ -82,7 +82,7 @@ parameterSets = cms.vstring("Photospp") ) process.generator.PythiaParameters.processParameters += cms.vstring( - 'ParticleDecays:allowPhotonRadiation = off', + 'HadronLevel:QED = off', 'TimeShower:QEDshowerByL = off' ) @@ -103,7 +103,7 @@ parameterSets = cms.vstring("Photospp") ) process.generator.PythiaParameters.processParameters += cms.vstring( - 'ParticleDecays:allowPhotonRadiation = off', + 'HadronLevel:QED = off', 'TimeShower:QEDshowerByL = off' ) @@ -124,7 +124,7 @@ parameterSets = cms.vstring("Photospp") ) process.generator.PythiaParameters.processParameters += cms.vstring( - 'ParticleDecays:allowPhotonRadiation = off', + 'HadronLevel:QED = off', 'TimeShower:QEDshowerByL = off' ) diff --git a/GeneratorInterface/Pythia8Interface/test/FXFXewk_test.py b/GeneratorInterface/Pythia8Interface/test/FXFXewk_test.py index 9bf0dd2bd7103..af42dea407252 100644 --- a/GeneratorInterface/Pythia8Interface/test/FXFXewk_test.py +++ b/GeneratorInterface/Pythia8Interface/test/FXFXewk_test.py @@ -146,7 +146,7 @@ 'SLHA:minMassSM = 1000.', 'ParticleDecays:limitTau0 = on', 'ParticleDecays:tau0Max = 10', - 'ParticleDecays:allowPhotonRadiation = on' + 'HadronLevel:QED = on' ), pythia8PSweightsSettings = cms.vstring( 'UncertaintyBands:doVariations = on', diff --git a/GeneratorInterface/Pythia8Interface/test/ZToTauTau_photos_13TeV_rivet_cfg.py b/GeneratorInterface/Pythia8Interface/test/ZToTauTau_photos_13TeV_rivet_cfg.py index c936305173ae1..1be67aa793661 100644 --- a/GeneratorInterface/Pythia8Interface/test/ZToTauTau_photos_13TeV_rivet_cfg.py +++ b/GeneratorInterface/Pythia8Interface/test/ZToTauTau_photos_13TeV_rivet_cfg.py @@ -45,7 +45,7 @@ 'PhaseSpace:mHatMin = 50.', '23:onMode = off', '23:onIfAny = 15', - 'ParticleDecays:allowPhotonRadiation = on', + 'HadronLevel:QED = on', 'TimeShower:QEDshowerByL = off', ), parameterSets = cms.vstring('pythia8CommonSettings', diff --git a/GeneratorInterface/Pythia8Interface/test/test_Pythia8ConcurrentGeneratorFilter_WZ_TuneCP5_13TeV-pythia8.sh b/GeneratorInterface/Pythia8Interface/test/test_Pythia8ConcurrentGeneratorFilter_WZ_TuneCP5_13TeV-pythia8.sh index cf04baf67b626..8834f14916c4a 100755 --- a/GeneratorInterface/Pythia8Interface/test/test_Pythia8ConcurrentGeneratorFilter_WZ_TuneCP5_13TeV-pythia8.sh +++ b/GeneratorInterface/Pythia8Interface/test/test_Pythia8ConcurrentGeneratorFilter_WZ_TuneCP5_13TeV-pythia8.sh @@ -7,5 +7,6 @@ export PYTHONPATH="${PWD}${PYTHONPATH:+:$PYTHONPATH}" cmsDriver.py GIP8/BTV-RunIISummer20UL17GEN-00002-fragment.py --python_filename test_BTV-RunIISummer20UL17GEN-00002_1_cfg.py --eventcontent RAWSIM --customise Configuration/DataProcessing/Utils.addMonitoring --datatier GEN --fileout file:test_BTV-RunIISummer20UL17GEN-00002.root --conditions auto:run2_mc --beamspot Realistic25ns13TeVEarly2017Collision --customise_commands process.source.numberEventsInLuminosityBlock="cms.untracked.uint32(10)" --step GEN --geometry DB:Extended --era Run2_2017 --no_exec --mc -n 50 --nThreads 4 --nConcurrentLumis 0 sed -i "s/Pythia8GeneratorFilter/Pythia8ConcurrentGeneratorFilter/g" test_BTV-RunIISummer20UL17GEN-00002_1_cfg.py +sed -i "s/ParticleDecays:allowPhotonRadiation/HadronLevel:QED/g" test_BTV-RunIISummer20UL17GEN-00002_1_cfg.py cmsRun test_BTV-RunIISummer20UL17GEN-00002_1_cfg.py