Changes in modules/Isolation.cc [3db5282:df35033] in git

File:

• modules/Isolation.cc (modified) (6 diffs)

modules/Isolation.cc

@@ -25 +25 @@
  *  the transverse momenta fraction within (PTRatioMin, PTRatioMax].
  *
- *  \author P. Demin, M. Selvaggi, R. Gerosa - UCL, Louvain-la-Neuve
+ *  \author P. Demin - UCL, Louvain-la-Neuve
  *
  */
@@ -109 +109 @@
   fUsePTSum = GetBool("UsePTSum", false);
 
-  fVetoLeptons = GetBool("VetoLeptons", true);  
-  
   fClassifier->fPTMin = GetDouble("PTMin", 0.5);
-
 
   // import input array(s)
@@ -156 +153 @@
   Candidate *candidate, *isolation, *object;
   TObjArray *isolationArray;
-  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr;
+  Double_t sum, ratio;
   Int_t counter;
   Double_t eta = 0.0;
@@ -183 +180 @@
 
     // loop over all input tracks
-    
-    sumNeutral = 0.0;
-    sumCharged = 0.0;
-    sumChargedPU = 0.0;
-    sumAllParticles = 0.0;
-   
+    sum = 0.0;
     counter = 0;
     itIsolationArray.Reset();
-    
     while((isolation = static_cast<Candidate*>(itIsolationArray.Next())))
     {
@@ -197 +188 @@
 
       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) 
-        { 
-          sumCharged += isolationMomentum.Pt();
-          if(isolation->IsRecoPU != 0) sumChargedPU += isolationMomentum.Pt();
-        } 
-  
-        else sumNeutral += isolationMomentum.Pt();
-  
+        sum += isolationMomentum.Pt();
         ++counter;
       }
@@ -228 +209 @@
     }
 
-        
-     // correct sum for pile-up contamination
-    sumDBeta = sumCharged + TMath::Max(sumNeutral-0.5*sumChargedPU,0.0);
-    sumRhoCorr = sumCharged + TMath::Max(sumNeutral-TMath::Max(rho,0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(),0.0);
-    ratioDBeta = sumDBeta/candidateMomentum.Pt();
-    ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
-    
-    candidate->IsolationVar = ratioDBeta;
-    candidate->IsolationVarRhoCorr = ratioRhoCorr;
-    candidate->SumPtCharged = sumCharged;
-    candidate->SumPtNeutral = sumNeutral;
-    candidate->SumPtChargedPU = sumChargedPU;
-    candidate->SumPt = sumAllParticles;
-
-    if((fUsePTSum && sumDBeta > fPTSumMax) || ratioDBeta > fPTRatioMax) continue;
+    // correct sum for pile-up contamination
+    sum = sum - rho*fDeltaRMax*fDeltaRMax*TMath::Pi();
+
+    ratio = sum/candidateMomentum.Pt();
+    if((fUsePTSum && sum > fPTSumMax) || ratio > fPTRatioMax) continue;
+
     fOutputArray->Add(candidate);
   }