Changeset e2339af in git for modules

Timestamp:

Jun 6, 2016, 4:35:02 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

740d430

Parents:

f8299bc

Message:

added UseMiniCone option in isolation

Location:

modules

Files:

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

modules/Isolation.cc

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

modules/Isolation.h

@@ -57 +57 @@
   Double_t fPTSumMax;
 
+  Double_t fDeltaRMin;
+
   Bool_t fUsePTSum;
 
   Bool_t fUseRhoCorrection;
+
+  Bool_t fUseMiniCone;
 
   IsolationClassifier *fClassifier; //!