Changeset fdfac34 in git for modules

Timestamp:

Nov 20, 2015, 1:43:00 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

715ab7c

Parents:

004aa60

Message:

fix sumCharged in Isolation

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();