Changeset 7f9ae0a in git for modules/Isolation.cc

Timestamp:

Jan 26, 2015, 2:34:50 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b62c2da

Parents:

e2d3977

Message:

Isolation modified inspired by rgerosa implementation

File:

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

modules/Isolation.cc

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