Changeset 16217da in git

Timestamp:

Nov 7, 2015, 10:48:54 AM (9 years ago)

Author:

Chase <cshimmin@…>

Parents:

386e60f (diff), e72ee4b (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 e72ee4bacd07a16f49d40e753ed688eab57b177b into 386e60f7bad9454d510ae91e3aee16900452ee37

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);
@@ -153 +155 @@
   Candidate *candidate, *isolation, *object;
   TObjArray *isolationArray;
-  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr;
+  Double_t sumCharged, sumNeutral, sumAllParticles, sumChargedPU, sumDBeta, ratioDBeta, sumRhoCorr, ratioRhoCorr, sum, ratio;
   Int_t counter;
   Double_t eta = 0.0;
@@ -245 +247 @@
     candidate->SumPt = sumAllParticles;
 
-    if((fUsePTSum && sumDBeta > fPTSumMax) || (!fUsePTSum && ratioDBeta > fPTRatioMax)) continue;
+    sum = (fUseRhoCorr) ? sumRhoCorr : sumDBeta;
+    if(fUsePTSum && sum > fPTSumMax) continue;
+
+    ratio = (fUseRhoCorr) ? ratioRhoCorr : ratioDBeta;
+    if(!fUsePTSum && ratio > fPTRatioMax) continue;
+
     fOutputArray->Add(candidate);
   }

modules/Isolation.h

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