Merge pull request #27691 from knash/jetid_mufracfix

Jetid muon fraction fix
cms-sw · Aug 22, 2019 · bd91394 · bd91394
2 parents 808a7f6 + f29b7fb
commit bd91394
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/PhysicsTools/SelectorUtils/interface/PFJetIDSelectionFunctor.h b/PhysicsTools/SelectorUtils/interface/PFJetIDSelectionFunctor.h
@@ -252,6 +252,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
     double cef = 0.0;
     double nef = 0.0;
     double muf = 0.0;
+
     int nch = 0;
     int nconstituents = 0;
     int nneutrals = 0;
@@ -268,6 +269,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
         cef = patJet->chargedEmEnergyFraction();
         nef = patJet->neutralEmEnergyFraction();
         nch = patJet->chargedMultiplicity();
+        muf = patJet->muonEnergyFraction();
         nconstituents = patJet->numberOfDaughters();
         nneutrals = patJet->neutralMultiplicity();
         // Handle the special case of PUPPI jets with weighted multiplicities
@@ -283,6 +285,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
         double e_nhf = 0.0;
         double e_cef = 0.0;
         double e_nef = 0.0;
+        double e_muf = 0.0;
         nch = 0;
         nconstituents = 0;
         nneutrals = 0;
@@ -296,6 +299,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
             e_nhf += patsub->neutralHadronEnergy();
             e_cef += patsub->chargedEmEnergy();
             e_nef += patsub->neutralEmEnergy();
+            e_muf += patsub->muonEnergy();
             nch += patsub->chargedMultiplicity();
             nconstituents += patsub->numberOfDaughters();
             nneutrals += patsub->neutralMultiplicity();
@@ -304,6 +308,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
             e_nhf += pfsub->neutralHadronEnergy();
             e_cef += pfsub->chargedEmEnergy();
             e_nef += pfsub->neutralEmEnergy();
+            e_muf += pfsub->muonEnergy();
             nch += pfsub->chargedMultiplicity();
             nconstituents += pfsub->numberOfDaughters();
             nneutrals += pfsub->neutralMultiplicity();
@@ -316,8 +321,9 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
           nhf = e_nhf / e;
           cef = e_cef / e;
           nef = e_nef / e;
+          muf = e_muf / e;
         } else {
-          chf = nhf = cef = nef = 0.0;
+          chf = nhf = cef = nef = muf = 0.0;
         }
       }
     }  // end if pat jet
@@ -344,6 +350,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
       double e_nhf = 0.0;
       double e_cef = 0.0;
       double e_nef = 0.0;
+      double e_muf = 0.0;
       nch = 0;
       nconstituents = 0;
       for (reco::Jet::const_iterator ibegin = basicJet->begin(), iend = patJet->end(), isub = ibegin; isub != iend;
@@ -353,6 +360,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
         e_nhf += pfsub->neutralHadronEnergy();
         e_cef += pfsub->chargedEmEnergy();
         e_nef += pfsub->neutralEmEnergy();
+        e_muf += pfsub->muonEnergy();
         nch += pfsub->chargedMultiplicity();
         nconstituents += pfsub->numberOfDaughters();
         nneutrals += pfsub->neutralMultiplicity();
@@ -363,6 +371,7 @@ class PFJetIDSelectionFunctor : public Selector<pat::Jet> {
         nhf = e_nhf / e;
         cef = e_cef / e;
         nef = e_nef / e;
+        muf = e_muf / e;
       }
     }  // end if basic jet