Changeset b9e210d in git for modules/Isolation.cc

Timestamp:

Nov 20, 2015, 1:46:03 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4283572

Parents:

723b77d (diff), 715ab7c (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) (2 diffs)

modules/Isolation.cc

@@ -206 +206 @@
       {
         sumAllParticles += isolationMomentum.Pt();
-        if(isolation->Charge !=0)
-        {
-          sumCharged += isolationMomentum.Pt();
-          if(isolation->IsRecoPU != 0) sumChargedPU += isolationMomentum.Pt();
+        if(isolation->Charge != 0)
+        {
+          if(isolation->IsRecoPU)
+          {
+            sumChargedPU += isolationMomentum.Pt();
+          }
+          else
+          {
+            sumCharged += isolationMomentum.Pt();
+          }
         }
         else
@@ -234 +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 = 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();