Changeset 723b77d in git for modules/Isolation.cc

Timestamp:

Nov 20, 2015, 11:33:36 AM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b9e210d

Parents:

8e2bc10 (diff), 004aa60 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:delphes/delphes

File:

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

modules/Isolation.cc

@@ -153 +153 @@
   Candidate *candidate, *isolation, *object;
   TObjArray *isolationArray;
-  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr;
+  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU;
+  Double_t sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
   Int_t counter;
   Double_t eta = 0.0;
@@ -188 +189 @@
 
     // 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())))
     {
@@ -205 +206 @@
       {
         sumAllParticles += isolationMomentum.Pt();
-        if(isolation->Charge !=0) 
-        { 
-          sumCharged += isolationMomentum.Pt();
+        if(isolation->Charge !=0)
+        {
+          sumCharged += isolationMomentum.Pt();
           if(isolation->IsRecoPU != 0) sumChargedPU += isolationMomentum.Pt();
-        } 
+        }
         else
-        {
-          sumNeutral += isolationMomentum.Pt();
+        {
+          sumNeutral += isolationMomentum.Pt();
         }
         ++counter;
@@ -232 +233 @@
     }
 
-     // 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);
+    // 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;
@@ -245 +246 @@
     candidate->SumPt = sumAllParticles;
 
-    if((fUsePTSum && sumRhoCorr > fPTSumMax) || (!fUsePTSum && ratioRhoCorr > fPTRatioMax)) continue;
+    sum = fRhoInputArray ? sumRhoCorr : sumDBeta;
+    if(fUsePTSum && sum > fPTSumMax) continue;
+
+    ratio = fRhoInputArray ? ratioRhoCorr : ratioDBeta;
+    if(!fUsePTSum && ratio > fPTRatioMax) continue;
+
     fOutputArray->Add(candidate);
   }