Changes in modules/Isolation.cc [48b6e45:df35033] in git

File:

• modules/Isolation.cc (modified) (4 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
  *
  */
@@ -153 +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;
   Double_t rho = 0.0;
 
+  if(fRhoInputArray && fRhoInputArray->GetEntriesFast() > 0)
+  {
+    candidate = static_cast<Candidate*>(fRhoInputArray->At(0));
+    rho = candidate->Momentum.Pt();
+  }
+
   // select isolation objects
   fFilter->Reset();
@@ -172 +178 @@
     const TLorentzVector &candidateMomentum = candidate->Momentum;
     eta = TMath::Abs(candidateMomentum.Eta());
+
+    // loop over all input tracks
+    sum = 0.0;
+    counter = 0;
+    itIsolationArray.Reset();
+    while((isolation = static_cast<Candidate*>(itIsolationArray.Next())))
+    {
+      const TLorentzVector &isolationMomentum = isolation->Momentum;
+
+      if(candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
+         candidate->GetUniqueID() != isolation->GetUniqueID())
+      {
+        sum += isolationMomentum.Pt();
+        ++counter;
+      }
+    }
 
     // find rho
@@ -187 +209 @@
     }
 
-    // loop over all input tracks
-    
-    sumNeutral = 0.0;
-    sumCharged = 0.0;
-    sumChargedPU = 0.0;
-    sumAllParticles = 0.0;
-   
-    counter = 0;
-    itIsolationArray.Reset();
-    
-    while((isolation = static_cast<Candidate*>(itIsolationArray.Next())))
-    {
-      const TLorentzVector &isolationMomentum = isolation->Momentum;
-
-      if(candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
-         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();
-        }
-        ++counter;
-      }
-    }
-
-    // find rho
-    rho = 0.0;
-    if(fRhoInputArray)
-    {
-      fItRhoInputArray->Reset();
-      while((object = static_cast<Candidate*>(fItRhoInputArray->Next())))
-      {
-        if(eta >= object->Edges[0] && eta < object->Edges[1])
-        {
-          rho = object->Momentum.Pt();
-        }
-      }
-    }
-
-     // 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) || (!fUsePTSum && 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);
   }