Changes in modules/Isolation.cc [e2339af:844a970] in git

File:

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

modules/Isolation.cc

@@ -110 +110 @@
 
   fUseRhoCorrection = GetBool("UseRhoCorrection", true);
-
-  fDeltaRMin = GetDouble("DeltaRMin", 0.01);
-  fUseMiniCone = GetBool("UseMiniCone", false);
 
   fClassifier->fPTMin = GetDouble("PTMin", 0.5);
@@ -160 +157 @@
   Double_t sumChargedNoPU, sumChargedPU, sumNeutral, sumAllParticles;
   Double_t sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
-  Bool_t pass = kFALSE;
+  Int_t counter;
   Double_t eta = 0.0;
   Double_t rho = 0.0;
@@ -200 +197 @@
     sumAllParticles = 0.0;
 
+    counter = 0;
     itIsolationArray.Reset();
+
     while((isolation = static_cast<Candidate*>(itIsolationArray.Next())))
     {
       const TLorentzVector &isolationMomentum = isolation->Momentum;
 
-      if(fUseMiniCone)
+      if(candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
+         candidate->GetUniqueID() != isolation->GetUniqueID())
       {
-         pass = candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
-         candidateMomentum.DeltaR(isolationMomentum) > fDeltaRMin;
-      }
-      else
-      {
-         pass = candidateMomentum.DeltaR(isolationMomentum) <= fDeltaRMax &&
-         candidate->GetUniqueID() != isolation->GetUniqueID();
-      }
-
-      if(pass)
-      {
-
         sumAllParticles += isolationMomentum.Pt();
         if(isolation->Charge != 0)
@@ -235 +223 @@
           sumNeutral += isolationMomentum.Pt();
         }
+        ++counter;
       }
-
     }
 
-   // find rho
+    // find rho
     rho = 0.0;
     if(fRhoInputArray)
@@ -253 +241 @@
     }
 
-
-
     // correct sum for pile-up contamination
     sumDBeta = sumChargedNoPU + TMath::Max(sumNeutral - 0.5*sumChargedPU, 0.0);