Changeset 8336b6e in git for modules/JetPileUpSubtractor.cc

Timestamp:

Nov 4, 2013, 11:59:27 AM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

e9065e7

Parents:

498cda4

Message:

add eta ranges for rho

File:

• modules/JetPileUpSubtractor.cc (modified) (5 diffs)

modules/JetPileUpSubtractor.cc

@@ -39 +39 @@
 
 JetPileUpSubtractor::JetPileUpSubtractor() :
-  fItJetInputArray(0)
+  fItJetInputArray(0), fItRhoInputArray(0)
 {
 
@@ -63 +63 @@
 
   fRhoInputArray = ImportArray(GetString("RhoInputArray", "Rho/rho"));
+  fItRhoInputArray = fRhoInputArray->MakeIterator();
 
   // create output array(s)
@@ -74 +75 @@
 void JetPileUpSubtractor::Finish()
 {
+  if(fItRhoInputArray) delete fItRhoInputArray;
   if(fItJetInputArray) delete fItJetInputArray;
 }
@@ -83 +85 @@
   Candidate *candidate;
   TLorentzVector momentum, area;
+  Double_t eta = 0.0;
   Double_t rho = 0.0;
 
-  if(fRhoInputArray && fRhoInputArray->GetEntriesFast() > 0)
-  {
-    candidate = static_cast<Candidate*>(fRhoInputArray->At(0));
-    rho = candidate->Momentum.Pt();
-  }
+  if(!fRhoInputArray) return;
 
   // loop over all input candidates
@@ -97 +96 @@
     momentum = candidate->Momentum;
     area = candidate->Area;
+    eta = TMath::Abs(momentum.Eta());
+
+    // find rho
+    rho = 0.0;
+    while((candidate = static_cast<Candidate*>(fItRhoInputArray->Next())))
+    {
+      if(eta >= candidate->Edges[0] && eta < candidate->Edges[1])
+      {
+        rho = candidate->Momentum.Pt();
+      }
+    }  
 
     // apply pile-up correction