Changeset b286067 in git

Timestamp:

Aug 19, 2013, 3:40:54 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

76d3973

Parents:

82e07cf

Message:

added UsePTSum and PTSumMax parameters to the Isolation module

Files:

• CHANGELOG (modified) (1 diff)
• modules/Isolation.cc (modified) (4 diffs)
• modules/Isolation.h (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 3.0.10:
+  added UsePTSum and PTSumMax parameters to the Isolation module
   added posibility to read reweighting information from LHEF
   updated ATLAS and CMS example cards
   added DelphesProMC.py reader
-  added calculation of time after propagation in ParticlePropagator
+  added calculation of time after propagation in the ParticlePropagator module
   improved energy flow algorithm
-  fixed tau-jet matching in TauTagging module
+  fixed tau-jet matching in the TauTagging module
   modified all the readers to read particle mass from input file
   adapted LHCO output files to counter a bug in MadAnalysis

modules/Isolation.cc

@@ -90 +90 @@
   fPTRatioMax = GetDouble("PTRatioMax", 0.1);
 
+  fPTSumMax = GetDouble("PTSumMax", 5.0);
+
+  fUsePTSum = GetBool("UsePTSum", false);
+
   fClassifier->fPTMin = GetDouble("PTMin", 0.5);
 
@@ -132 +136 @@
   Candidate *candidate, *isolation;
   TObjArray *isolationArray;
-  Double_t sumPT, ratio;
+  Double_t sum, ratio;
   Int_t counter;
   Double_t rho = 0.0;
@@ -157 +161 @@
 
     // loop over all input tracks
-    sumPT = 0.0;
+    sum = 0.0;
     counter = 0;
     itIsolationArray.Reset();
@@ -167 +171 @@
          !candidate->Overlaps(isolation))
       {
-        sumPT += isolationMomentum.Pt();
+        sum += isolationMomentum.Pt();
         ++counter;
       }
     }
 
-    // correct sumPT for pile-up contamination
-    sumPT = sumPT - rho*fDeltaRMax*fDeltaRMax*TMath::Pi();  
+    // correct sum for pile-up contamination
+    sum = sum - rho*fDeltaRMax*fDeltaRMax*TMath::Pi();  
 
-    ratio = sumPT/candidateMomentum.Pt();
-    if(ratio > fPTRatioMax) continue;
+    ratio = sum/candidateMomentum.Pt();
+    if((fUsePTSum && sum > fPTSumMax) || ratio > fPTRatioMax) continue;
 
     fOutputArray->Add(candidate);

modules/Isolation.h

@@ -41 +41 @@
   Double_t fPTRatioMax;
 
+  Double_t fPTSumMax;
+
+  Bool_t fUsePTSum;
+
   IsolationClassifier *fClassifier; //!