Changeset 7aea88d in git

Timestamp:

Jul 28, 2015, 3:12:14 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d1942df

Parents:

fb4337d

git-author:

Michele Selvaggi <michele.selvaggi@…> (07/28/15 15:11:03)

git-committer:

Michele Selvaggi <michele.selvaggi@…> (07/28/15 15:12:14)

Message:

now accounts for rhos calculated in different eta regions in Isolation module

File:

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

modules/Isolation.cc

@@ -121 +121 @@
   fItCandidateInputArray = fCandidateInputArray->MakeIterator();
 
-  rhoInputArrayName = GetString("RhoInputArray", "");
+  rhoInputArrayName = GetString("RhoInputArray", "Rho/rho");
   if(rhoInputArrayName[0] != '\0')
   {
@@ -158 +158 @@
   Double_t rho = 0.0;
 
-  if(fRhoInputArray && fRhoInputArray->GetEntriesFast() > 0)
-  {
-    candidate = static_cast<Candidate*>(fRhoInputArray->At(0));
-    rho = candidate->Momentum.Pt();
-  }
-
   // select isolation objects
   fFilter->Reset();
@@ -178 +172 @@
     const TLorentzVector &candidateMomentum = candidate->Momentum;
     eta = TMath::Abs(candidateMomentum.Eta());
+
+    // find rho
+    rho = 0.0;
+    if(fRhoInputArray)
+    {
+      fItRhoInputArray->Reset();
+      while((object = static_cast<Candidate*>(fItRhoInputArray->Next())))
+      {
+        if(eta >= object->Edges[0] && eta < object->Edges[1])
+        {
+          rho = object->Momentum.Pt();
+        }
+      }
+    }
 
     // loop over all input tracks