Changes in / [16217da:386e60f] in git

Location:

modules

Files:

• Isolation.cc (modified) (3 diffs)
• Isolation.h (modified) (1 diff)

modules/Isolation.cc

@@ -108 +108 @@
 
   fUsePTSum = GetBool("UsePTSum", false);
-
-  fUseRhoCorr = GetBool("UseRhoCorrection", false);
 
   fClassifier->fPTMin = GetDouble("PTMin", 0.5);
@@ -155 +153 @@
   Candidate *candidate, *isolation, *object;
   TObjArray *isolationArray;
-  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
+  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr;
   Int_t counter;
   Double_t eta = 0.0;
@@ -247 +245 @@
     candidate->SumPt = sumAllParticles;
 
-    sum = (fUseRhoCorr) ? sumRhoCorr : sumDBeta;
-    if(fUsePTSum && sum > fPTSumMax) continue;
-
-    ratio = (fUseRhoCorr) ? ratioRhoCorr : ratioDBeta;
-    if(!fUsePTSum && ratio > fPTRatioMax) continue;
-
+    if((fUsePTSum && sumDBeta > fPTSumMax) || (!fUsePTSum && ratioDBeta > fPTRatioMax)) continue;
     fOutputArray->Add(candidate);
   }

modules/Isolation.h

@@ -59 +59 @@
   Bool_t fUsePTSum;
 
-  Bool_t fUseRhoCorr;
-
   IsolationClassifier *fClassifier; //!