Skip to content

Fix cross section when using ResonanceDecayFilter #46725

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.

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions GeneratorInterface/Core/plugins/GenFilterEfficiencyProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

#include "SimDataFormats/GeneratorProducts/interface/GenFilterInfo.h"
#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
#include "GeneratorInterface/Pythia8Interface/interface/ResonanceDecayFilterCounter.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"

namespace genFilterEff {
Expand Down Expand Up @@ -120,6 +121,10 @@ void GenFilterEfficiencyProducer::produce(edm::StreamID, edm::Event& iEvent, con
return;
double weight = genEventScale->weight();

int eventCounterValue = ResonanceDecayFilterCounter::getInstance().getFilterBool()
? ResonanceDecayFilterCounter::getInstance().getEventCounter()
: 1;

auto sums = luminosityBlockCache(iEvent.getLuminosityBlock().index());

unsigned int nSize = (*trigR).size();
Expand All @@ -131,8 +136,8 @@ void GenFilterEfficiencyProducer::produce(edm::StreamID, edm::Event& iEvent, con
atomic_sum_double(sums->sumpass_w_, weight);
atomic_sum_double(sums->sumpass_w2_, weight * weight);

atomic_sum_double(sums->sumtotal_w_, weight);
atomic_sum_double(sums->sumtotal_w2_, weight * weight);
atomic_sum_double(sums->sumtotal_w_, weight * eventCounterValue);
atomic_sum_double(sums->sumtotal_w2_, weight * weight * eventCounterValue);

if (weight > 0) {
sums->numEventsPassPos_++;
Expand All @@ -144,8 +149,8 @@ void GenFilterEfficiencyProducer::produce(edm::StreamID, edm::Event& iEvent, con

} else // if fail the filter
{
atomic_sum_double(sums->sumtotal_w_, weight);
atomic_sum_double(sums->sumtotal_w2_, weight * weight);
atomic_sum_double(sums->sumtotal_w_, weight * eventCounterValue);
atomic_sum_double(sums->sumtotal_w2_, weight * weight * eventCounterValue);

if (weight > 0)
sums->numEventsTotalPos_++;
Expand Down
6 changes: 4 additions & 2 deletions GeneratorInterface/Core/plugins/GenXSecAnalyzer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoProduct.h"
#include "SimDataFormats/GeneratorProducts/interface/GenFilterInfo.h"
#include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h"
#include "GeneratorInterface/Pythia8Interface/interface/ResonanceDecayFilterCounter.h"

#include "FWCore/Framework/interface/MakerMacros.h"

Expand Down Expand Up @@ -332,8 +333,9 @@ void GenXSecAnalyzer::globalEndRun(edm::Run const &iRun, edm::EventSetup const &
double thisGenFilterErr = 0;

if (runC->filterOnlyEffRun_.sumWeights2() > 0) {
thisGenFilterEff = runC->filterOnlyEffRun_.filterEfficiency(hepidwtup_);
thisGenFilterErr = runC->filterOnlyEffRun_.filterEfficiencyError(hepidwtup_);
int input_genfilter_efficiency = ResonanceDecayFilterCounter::getInstance().getFilterBool() ? 1 : hepidwtup_.load();
thisGenFilterEff = runC->filterOnlyEffRun_.filterEfficiency(input_genfilter_efficiency);
thisGenFilterErr = runC->filterOnlyEffRun_.filterEfficiencyError(input_genfilter_efficiency);
if (thisGenFilterEff < 0) {
thisGenFilterEff = 1;
thisGenFilterErr = 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#ifndef GeneratorInterface_Pythia8Interface_ResonanceDecayFilterCounter_h
#define GeneratorInterface_Pythia8Interface_ResonanceDecayFilterCounter_h

class ResonanceDecayFilterCounter {
public:
static ResonanceDecayFilterCounter& getInstance() {
static ResonanceDecayFilterCounter instance;
return instance;
}

void setEventCounter(int eventCounter) { eventCounter_ = eventCounter; }

void setFilterBool(bool filterBool) { filterBool_ = filterBool; }

int getEventCounter() const { return eventCounter_; }

bool getFilterBool() const { return filterBool_; }

private:
ResonanceDecayFilterCounter() : eventCounter_(0), filterBool_(false) {}
int eventCounter_;
bool filterBool_;
};

#endif // GeneratorInterface_Pythia8Interface_ResonanceDecayFilterCounter_h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class ResonanceDecayFilterHook : public Pythia8::UserHooks {
bool canVetoResonanceDecays() override { return true; }
bool doVetoResonanceDecays(Pythia8::Event& process) override { return checkVetoResonanceDecays(process); }
bool checkVetoResonanceDecays(const Pythia8::Event& process);
unsigned long int returnEventCounter() { return counter_event_; };
void resetEventCounter();

//--------------------------------------------------------------------------

Expand All @@ -25,6 +27,7 @@ class ResonanceDecayFilterHook : public Pythia8::UserHooks {
bool udscAsEquivalent_;
bool udscbAsEquivalent_;
bool wzAsEquivalent_;
unsigned long int counter_event_;
std::set<int> mothers_;
std::vector<int> daughters_;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ using namespace Pythia8;

//decay filter hook
#include "GeneratorInterface/Pythia8Interface/interface/ResonanceDecayFilterHook.h"
#include "GeneratorInterface/Pythia8Interface/interface/ResonanceDecayFilterCounter.h"

//decay filter hook
#include "GeneratorInterface/Pythia8Interface/interface/PTFilterHook.h"
Expand Down Expand Up @@ -531,6 +532,7 @@ bool Pythia8Hadronizer::initializeForInternalPartons() {
}

bool resonanceDecayFilter = fMasterGen->settings.flag("ResonanceDecayFilter:filter");
ResonanceDecayFilterCounter::getInstance().setFilterBool(resonanceDecayFilter);
if (resonanceDecayFilter) {
fResonanceDecayFilterHook.reset(new ResonanceDecayFilterHook);
(fUserHooksVector->hooks).push_back(fResonanceDecayFilterHook);
Expand Down Expand Up @@ -698,6 +700,7 @@ bool Pythia8Hadronizer::initializeForExternalPartons() {
}

bool resonanceDecayFilter = fMasterGen->settings.flag("ResonanceDecayFilter:filter");
ResonanceDecayFilterCounter::getInstance().setFilterBool(resonanceDecayFilter);
if (resonanceDecayFilter) {
fResonanceDecayFilterHook.reset(new ResonanceDecayFilterHook);
(fUserHooksVector->hooks).push_back(fResonanceDecayFilterHook);
Expand Down Expand Up @@ -971,6 +974,12 @@ bool Pythia8Hadronizer::hadronize() {
}
}

if (fMasterGen->settings.flag("ResonanceDecayFilter:filter")) {
int eventCounterValue = fResonanceDecayFilterHook->returnEventCounter();
ResonanceDecayFilterCounter::getInstance().setEventCounter(eventCounterValue);
fResonanceDecayFilterHook->resetEventCounter();
}

return true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ using namespace Pythia8;

//--------------------------------------------------------------------------
bool ResonanceDecayFilterHook::initAfterBeams() {
counter_event_ = 0;
filter_ = settingsPtr->flag("ResonanceDecayFilter:filter");
exclusive_ = settingsPtr->flag("ResonanceDecayFilter:exclusive");
eMuAsEquivalent_ = settingsPtr->flag("ResonanceDecayFilter:eMuAsEquivalent");
Expand Down Expand Up @@ -52,6 +53,9 @@ bool ResonanceDecayFilterHook::checkVetoResonanceDecays(const Event &process) {
if (!filter_)
return false;

//count the number of times hook is called.
counter_event_++;

observedDaughters_.clear();

//count decay products
Expand Down Expand Up @@ -117,3 +121,5 @@ bool ResonanceDecayFilterHook::checkVetoResonanceDecays(const Event &process) {
//all criteria satisfied, don't veto
return false;
}

void ResonanceDecayFilterHook::resetEventCounter() { counter_event_ = 0; }