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

Jump to bottom

New jet flavour definition: Pruned GenParticles update #3228

Merged
merged 2 commits into from Apr 8, 2014
Merged

New jet flavour definition: Pruned GenParticles update #3228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d71a9d9
fixed parton selectors to work correctly also with pruned GenParticle…
ferencek Apr 5, 2014
349fb58
minor fix in the example code printout
ferencek Apr 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions PhysicsTools/JetExamples/test/printJetFlavourInfo.cc
View file
Open in desktop
Expand Up @@ -129,7 +129,7 @@ void printJetFlavourInfo::analyze(const edm::Event& iEvent, const edm::EventSetu
{
float dist = reco::deltaR( aJet->eta(), aJet->phi(), (*it)->eta(), (*it)->phi() );
float dist2 = reco::deltaR( aJet->rapidity(), aJet->phi(), (*it)->rapidity(), (*it)->phi() );
std::cout << " c hadron " << (it-cHadrons.begin())
std::cout << " c hadron " << (it-cHadrons.begin())
<< " PdgID, status, (pt,eta,rapidity,phi), dR(eta-phi), dR(rap-phi) = " << (*it)->pdgId()
<< ", " << (*it)->status()
<< ", (" << (*it)->pt()
Expand Down Expand Up @@ -233,7 +233,7 @@ void printJetFlavourInfo::analyze(const edm::Event& iEvent, const edm::EventSetu
{
float dist = reco::deltaR( aSubjet->eta(), aSubjet->phi(), (*it)->eta(), (*it)->phi() );
float dist2 = reco::deltaR( aSubjet->rapidity(), aSubjet->phi(), (*it)->rapidity(), (*it)->phi() );
std::cout << " c hadron " << (it-cHadrons.begin())
std::cout << " c hadron " << (it-cHadrons.begin())
<< " PdgID, status, (pt,eta,rapidity,phi), dR(eta-phi), dR(rap-phi) = " << (*it)->pdgId()
<< ", " << (*it)->status()
<< ", (" << (*it)->pt()
Expand Down
1 change: 0 additions & 1 deletion PhysicsTools/JetMCAlgos/src/Herwig6PartonSelector.cc
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@ Herwig6PartonSelector::run(const edm::Handle<reco::GenParticleCollection> & part
for(reco::GenParticleCollection::const_iterator it = particles->begin(); it != particles->end(); ++it)
{
if( it->status()!=2 ) continue; // only accept status==2 particles
if( it->numberOfDaughters()==0 ) continue; // skip particle if it has no daughters (likely a documentation line)
if( !CandMCTagUtils::isParton( *it ) ) continue; // skip particle if not a parton

partons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
Expand Down
1 change: 0 additions & 1 deletion PhysicsTools/JetMCAlgos/src/HerwigppPartonSelector.cc
View file
Open in desktop
Expand Up @@ -25,7 +25,6 @@ HerwigppPartonSelector::run(const edm::Handle<reco::GenParticleCollection> & par
for(reco::GenParticleCollection::const_iterator it = particles->begin(); it != particles->end(); ++it)
{
if( it->status()!=2 ) continue; // only accept status==2 particles
if( it->numberOfDaughters()==0 ) continue; // skip particle if it has no daughters (likely a documentation line)
if( !CandMCTagUtils::isParton( *it ) ) continue; // skip particle if not a parton

partons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
Expand Down
1 change: 0 additions & 1 deletion PhysicsTools/JetMCAlgos/src/Pythia6PartonSelector.cc
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@ Pythia6PartonSelector::run(const edm::Handle<reco::GenParticleCollection> & part
for(reco::GenParticleCollection::const_iterator it = particles->begin(); it != particles->end(); ++it)
{
if( it->status()!=2 ) continue; // only accept status==2 particles
if( it->numberOfDaughters()==0 ) continue; // skip particle if it has no daughters (likely a documentation line)
if( !CandMCTagUtils::isParton( *it ) ) continue; // skip particle if not a parton

partons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
Expand Down
5 changes: 2 additions & 3 deletions PhysicsTools/JetMCAlgos/src/Pythia8PartonSelector.cc
View file
Open in desktop
@@ -1,6 +1,6 @@

/**
* This is a Pythia8-specific parton selector that selects all status==71 partons. An explanation of
* This is a Pythia8-specific parton selector that selects all status==71 or 72 partons. An explanation of
* the particle status codes returned by Pythia8 can be found in Pythia8 online manual
* (http://home.thep.lu.se/~torbjorn/pythia81html/ParticleProperties.html).
*/
Expand All @@ -25,8 +25,7 @@ Pythia8PartonSelector::run(const edm::Handle<reco::GenParticleCollection> & part
for(reco::GenParticleCollection::const_iterator it = particles->begin(); it != particles->end(); ++it)
{
int status = it->status();
if( !(status==71) ) continue; // only accept status==71 particles
if( it->numberOfDaughters()==0 ) continue; // skip particle if it has no daughters (likely a documentation line)
if( !(status==71 || status==72) ) continue; // only accept status==71 or 72 particles
if( !CandMCTagUtils::isParton( *it ) ) continue; // skip particle if not a parton

partons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
Expand Down
1 change: 0 additions & 1 deletion PhysicsTools/JetMCAlgos/src/SherpaPartonSelector.cc
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@ SherpaPartonSelector::run(const edm::Handle<reco::GenParticleCollection> & parti
for(reco::GenParticleCollection::const_iterator it = particles->begin(); it != particles->end(); ++it)
{
if( it->status()!=11 ) continue; // only accept status==11 particles
if( it->numberOfDaughters()==0 ) continue; // skip particle if it has no daughters (likely a documentation line)
if( !CandMCTagUtils::isParton( *it ) ) continue; // skip particle if not a parton

partons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
Expand Down