Changeset 1317 in svn for trunk

Timestamp:

Nov 4, 2013, 1:14:33 PM (11 years ago)

Author:

Pavel Demin

Message:

fix loop in JetPileUpSubtractor and add rho eta ranges for Isolation

Location:

trunk/modules

Files:

• Isolation.cc (modified) (6 diffs)
• Isolation.h (modified) (1 diff)
• JetPileUpSubtractor.cc (modified) (3 diffs)

trunk/modules/Isolation.cc

@@ -69 +69 @@
 Isolation::Isolation() :
   fClassifier(0), fFilter(0),
-  fItIsolationInputArray(0), fItCandidateInputArray(0)
+  fItIsolationInputArray(0), fItCandidateInputArray(0),
+  fItRhoInputArray(0)
 {
   fClassifier = new IsolationClassifier;
@@ -110 +111 @@
   {
     fRhoInputArray = ImportArray(rhoInputArrayName);
+    fItRhoInputArray = fRhoInputArray->MakeIterator();
   }
   else
@@ -125 +127 @@
 void Isolation::Finish()
 {
+  if(fItRhoInputArray) delete fItRhoInputArray;
   if(fFilter) delete fFilter;
   if(fItCandidateInputArray) delete fItCandidateInputArray;
@@ -134 +137 @@
 void Isolation::Process()
 {
-  Candidate *candidate, *isolation;
+  Candidate *candidate, *isolation, *object;
   TObjArray *isolationArray;
   Double_t sum, ratio;
   Int_t counter;
+  Double_t eta = 0.0;
   Double_t rho = 0.0;
 
@@ -159 +163 @@
   {
     const TLorentzVector &candidateMomentum = candidate->Momentum;
+    eta = TMath::Abs(candidateMomentum.Eta());
 
     // loop over all input tracks
@@ -176 +181 @@
     }
 
+    // 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();
+        }
+      }
+    }
+
     // correct sum for pile-up contamination
-    sum = sum - rho*fDeltaRMax*fDeltaRMax*TMath::Pi();  
+    sum = sum - rho*fDeltaRMax*fDeltaRMax*TMath::Pi();
 
     ratio = sum/candidateMomentum.Pt();

trunk/modules/Isolation.h

@@ -53 +53 @@
   TIterator *fItCandidateInputArray; //!
 
+  TIterator *fItRhoInputArray; //!
+
   const TObjArray *fIsolationInputArray; //!
 

trunk/modules/JetPileUpSubtractor.cc

@@ -83 +83 @@
 void JetPileUpSubtractor::Process()
 {
-  Candidate *candidate;
+  Candidate *candidate, *object;
   TLorentzVector momentum, area;
   Double_t eta = 0.0;
   Double_t rho = 0.0;
-
-  if(!fRhoInputArray) return;
 
   // loop over all input candidates
@@ -100 +98 @@
     // find rho
     rho = 0.0;
-    while((candidate = static_cast<Candidate*>(fItRhoInputArray->Next())))
+    if(fRhoInputArray)
     {
-      if(eta >= candidate->Edges[0] && eta < candidate->Edges[1])
+      fItRhoInputArray->Reset();
+      while((object = static_cast<Candidate*>(fItRhoInputArray->Next())))
       {
-        rho = candidate->Momentum.Pt();
+        if(eta >= object->Edges[0] && eta < object->Edges[1])
+        {
+          rho = object->Momentum.Pt();
+        }
       }
-    }  
+    }
 
     // apply pile-up correction
@@ -112 +114 @@
 
     momentum -= rho * area;
-  
+
     if(momentum.Pt() <= fJetPTMin) continue;