Merge pull request #39403 from mseidel42/Herwig7_partonFlavour_10_6

Herwig7 jet partonFlavour (10_6_X)
cms-sw · Nov 25, 2022 · 6ef5341 · 6ef5341
2 parents 8d796aa + e16c421
commit 6ef5341
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/PhysicsTools/JetMCAlgos/plugins/HadronAndPartonSelector.cc b/PhysicsTools/JetMCAlgos/plugins/HadronAndPartonSelector.cc
@@ -165,6 +165,8 @@ HadronAndPartonSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSet
        partonMode_="Herwig6";
      else if( moduleName.find("ThePEG")!=std::string::npos )
        partonMode_="Herwig++";
+     else if( moduleName.find("Herwig7")!=std::string::npos )
+       partonMode_="Herwig++";
      else if( moduleName.find("Sherpa")!=std::string::npos )
        partonMode_="Sherpa";
      else
@@ -256,18 +258,20 @@ HadronAndPartonSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSet
        leptons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
    }
 
-   // select partons
+   // select algorithmic partons
    if ( partonMode_!="Undefined" ) {
      partonSelector_->run(particles,partons);
-     for(reco::GenParticleCollection::const_iterator it = particles->begin(); it != particles->end(); ++it)
-     {
-      if(!fullChainPhysPartons_)
-      {
-         if( !(it->status()==3 || (( partonMode_=="Pythia8" ) && (it->status()==23)))) continue;
-      }
-       if( !CandMCTagUtils::isParton( *it ) ) continue;  // skip particle if not a parton
-       physicsPartons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
-     }
+   }
+
+   // select physics partons
+   for(reco::GenParticleCollection::const_iterator it = particles->begin(); it != particles->end(); ++it)
+   {
+    if(!fullChainPhysPartons_)
+    {
+       if( !(it->status()==3 || (( partonMode_=="Pythia8" ) && (it->status()==23)))) continue;
+    }
+     if( !CandMCTagUtils::isParton( *it ) ) continue;  // skip particle if not a parton
+     physicsPartons->push_back( reco::GenParticleRef( particles, it - particles->begin() ) );
    }
 
    iEvent.put(std::move(bHadrons), "bHadrons" );