Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Powheg+Vincia matching" #42020

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Revert "Powheg+Vincia matching" #42020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions GeneratorInterface/Pythia8Interface/plugins/Pythia8Hadronizer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ using namespace Pythia8;
// Emission Veto Hooks
//
#include "Pythia8Plugins/PowhegHooks.h"
#include "Pythia8Plugins/PowhegHooksVincia.h"
#include "GeneratorInterface/Pythia8Interface/plugins/EmissionVetoHook1.h"

// Resonance scale hook
Expand Down Expand Up @@ -133,7 +132,6 @@ class Pythia8Hadronizer : public Py8InterfaceBase {
// Emission Veto Hooks
//
std::shared_ptr<PowhegHooks> fEmissionVetoHook;
std::shared_ptr<PowhegHooksVincia> fEmissionVetoHookVincia;
std::shared_ptr<EmissionVetoHook1> fEmissionVetoHook1;

// Resonance scale hook
Expand Down Expand Up @@ -386,10 +384,7 @@ bool Pythia8Hadronizer::initializeForInternalPartons() {
(fUserHooksVector->hooks).push_back(fEmissionVetoHook1);
}

bool VinciaShower = fMasterGen->settings.mode("PartonShowers:Model") == 2;

if ((fMasterGen->settings.mode("POWHEG:veto") > 0 || fMasterGen->settings.mode("POWHEG:MPIveto") > 0) &&
!VinciaShower) {
if (fMasterGen->settings.mode("POWHEG:veto") > 0 || fMasterGen->settings.mode("POWHEG:MPIveto") > 0) {
if (fJetMatchingHook.get() || fEmissionVetoHook1.get())
throw edm::Exception(edm::errors::Configuration, "Pythia8Interface")
<< " Attempt to turn on PowhegHooks by pythia8 settings but there are incompatible hooks on \n Incompatible "
Expand All @@ -402,13 +397,6 @@ bool Pythia8Hadronizer::initializeForInternalPartons() {
(fUserHooksVector->hooks).push_back(fEmissionVetoHook);
}

if (fMasterGen->settings.mode("POWHEG:veto") > 0 && VinciaShower) {
edm::LogInfo("Pythia8Interface") << "Turning on Vincia Emission Veto Hook from pythia8 code";
if (!fEmissionVetoHookVincia.get())
fEmissionVetoHookVincia.reset(new PowhegHooksVincia());
(fUserHooksVector->hooks).push_back(fEmissionVetoHookVincia);
}

bool PowhegRes = fMasterGen->settings.flag("POWHEGres:calcScales");
if (PowhegRes) {
edm::LogInfo("Pythia8Interface") << "Turning on resonance scale setting from CMSSW Pythia8Interface";
Expand Down Expand Up @@ -555,10 +543,7 @@ bool Pythia8Hadronizer::initializeForExternalPartons() {
}
}

bool VinciaShower = fMasterGen->settings.mode("PartonShowers:Model") == 2;

if ((fMasterGen->settings.mode("POWHEG:veto") > 0 || fMasterGen->settings.mode("POWHEG:MPIveto") > 0) &&
!VinciaShower) {
if (fMasterGen->settings.mode("POWHEG:veto") > 0 || fMasterGen->settings.mode("POWHEG:MPIveto") > 0) {
if (fJetMatchingHook.get() || fEmissionVetoHook1.get())
throw edm::Exception(edm::errors::Configuration, "Pythia8Interface")
<< " Attempt to turn on PowhegHooks by pythia8 settings but there are incompatible hooks on \n Incompatible "
Expand All @@ -571,13 +556,6 @@ bool Pythia8Hadronizer::initializeForExternalPartons() {
(fUserHooksVector->hooks).push_back(fEmissionVetoHook);
}

if (fMasterGen->settings.mode("POWHEG:veto") > 0 && VinciaShower) {
edm::LogInfo("Pythia8Interface") << "Turning on Vincia Emission Veto Hook from pythia8 code";
if (!fEmissionVetoHookVincia.get())
fEmissionVetoHookVincia.reset(new PowhegHooksVincia());
(fUserHooksVector->hooks).push_back(fEmissionVetoHookVincia);
}

bool PowhegRes = fMasterGen->settings.flag("POWHEGres:calcScales");
if (PowhegRes) {
edm::LogInfo("Pythia8Interface") << "Turning on resonance scale setting from CMSSW Pythia8Interface";
Expand Down