Changeset e8abecd in git for modules

Timestamp:

Jun 30, 2015, 4:25:20 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8b13e78

Parents:

c627b07

Message:

remove lepton veto bug from Isolation

Location:

modules

Files:

• Isolation.cc (modified) (5 diffs)
• Isolation.h (modified) (1 diff)

modules/Isolation.cc

@@ -109 +109 @@
   fUsePTSum = GetBool("UsePTSum", false);
 
-  fVetoLeptons = GetBool("VetoLeptons", true);  
-  
   fClassifier->fPTMin = GetDouble("PTMin", 0.5);
-
 
   // import input array(s)
@@ -197 +194 @@
 
       if(candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
-         candidate->GetUniqueID() != isolation->GetUniqueID() &&
-         ( !fVetoLeptons || (TMath::Abs(candidate->PID) != 11 && (TMath::Abs(candidate->PID) != 13)) ) )
+         candidate->GetUniqueID() != isolation->GetUniqueID())
       {
-     
         sumAllParticles += isolationMomentum.Pt();
         if(isolation->Charge !=0) 
@@ -207 +202 @@
           if(isolation->IsRecoPU != 0) sumChargedPU += isolationMomentum.Pt();
         } 
-  
-        else sumNeutral += isolationMomentum.Pt();
-  
+        else
+        {
+          sumNeutral += isolationMomentum.Pt();
+        }
         ++counter;
       }
@@ -228 +224 @@
     }
 
-        
      // correct sum for pile-up contamination
     sumDBeta = sumCharged + TMath::Max(sumNeutral-0.5*sumChargedPU,0.0);
@@ -242 +237 @@
     candidate->SumPt = sumAllParticles;
 
-    if((fUsePTSum && sumDBeta > fPTSumMax) || ratioDBeta > fPTRatioMax) continue;
+    if((fUsePTSum && sumDBeta > fPTSumMax) || (!fUsePTSum && ratioDBeta > fPTRatioMax)) continue;
     fOutputArray->Add(candidate);
   }

modules/Isolation.h

@@ -59 +59 @@
   Bool_t fUsePTSum;
 
-  Bool_t fVetoLeptons;  
- 
   IsolationClassifier *fClassifier; //!