Changeset 9b756ad in git

Timestamp:

Nov 20, 2015, 2:09:18 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f436ed7

Parents:

4283572 (diff), cef50c9 (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;
+  Double_t sumChargedNoPU, sumChargedPU, sumNeutral, sumAllParticles;
   Double_t sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
   Int_t counter;
@@ -191 +191 @@
 
     sumNeutral = 0.0;
-    sumCharged = 0.0;
+    sumChargedNoPU = 0.0;
     sumChargedPU = 0.0;
     sumAllParticles = 0.0;
@@ -214 +214 @@
           else
           {
-            sumCharged += isolationMomentum.Pt();
+            sumChargedNoPU += isolationMomentum.Pt();
           }
         }
@@ -240 +240 @@
 
     // 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);
+    sumDBeta = sumChargedNoPU + TMath::Max(sumNeutral - 0.5*sumChargedPU, 0.0);
+    sumRhoCorr = sumChargedNoPU + TMath::Max(sumNeutral - TMath::Max(rho, 0.0)*fDeltaRMax*fDeltaRMax*TMath::Pi(), 0.0);
     ratioDBeta = sumDBeta/candidateMomentum.Pt();
     ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
@@ -247 +247 @@
     candidate->IsolationVar = ratioDBeta;
     candidate->IsolationVarRhoCorr = ratioRhoCorr;
-    candidate->SumPtCharged = sumCharged;
+    candidate->SumPtCharged = sumChargedNoPU;
     candidate->SumPtNeutral = sumNeutral;
     candidate->SumPtChargedPU = sumChargedPU;