Changeset 54b6dfc in git for modules

Timestamp:

Jan 17, 2014, 2:29:22 PM (11 years ago)

Author:

mselvaggi <mselvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

1150871

Parents:

24d005f

Message:

JetId v2

Location:

modules

Files:

• PileUpJetID.cc (modified) (6 diffs)
• PileUpJetID.h (modified) (1 diff)
• TrackPileUpSubtractor.cc (modified) (2 diffs)

modules/PileUpJetID.cc

@@ -36 +36 @@
 
 PileUpJetID::PileUpJetID() :
-  fItJetInputArray(0),fTrackInputArray(0),fNeutralInputArray(0)
+  fItJetInputArray(0),fTrackInputArray(0),fNeutralInputArray(0),fItVertexInputArray(0) 
 {
 
@@ -68 +68 @@
   fNeutralInputArray = ImportArray(GetString("NeutralInputArray", "Calorimeter/eflowTowers"));
   fItNeutralInputArray = fNeutralInputArray->MakeIterator();
-
-  // create output array(s)
+  
+  fVertexInputArray = ImportArray(GetString("VertexInputArray", "PileUpMerger/vertices"));
+  fItVertexInputArray = fVertexInputArray->MakeIterator();
+  
+  fZVertexResolution  = GetDouble("ZVertexResolution", 0.005)*1.0E3;
+// create output array(s)
 
   fOutputArray = ExportArray(GetString("OutputArray", "jets"));
@@ -83 +87 @@
   if(fItTrackInputArray) delete fItTrackInputArray;
   if(fItNeutralInputArray) delete fItNeutralInputArray;
+  if(fItVertexInputArray) delete fItVertexInputArray;
 
 }
@@ -92 +97 @@
   Candidate *candidate, *constituent;
   TLorentzVector momentum, area;
+  Double_t zvtx=0;
 
   Candidate *trk;
+
+ // find z position of primary vertex
+   
+  fItVertexInputArray->Reset();
+  while((candidate = static_cast<Candidate*>(fItVertexInputArray->Next())))
+  {
+    if(!candidate->IsPU)
+    {
+    zvtx = candidate->Position.Z();
+    break;
+    }
+  }
 
   // loop over all input candidates
@@ -129 +147 @@
         } else {
           // charged
-          if (constituent->IsPU) {
+          if (constituent->IsPU && TMath::Abs(constituent->Position.Z()-zvtx) > fZVertexResolution) {
             sumptchpu += pt;
           } else {
@@ -146 +164 @@
       // Not using constituents, using dr
       fItTrackInputArray->Reset();
-      while ((trk = static_cast<Candidate*>(fItTrackInputArray->Next()))) {
+       while ((trk = static_cast<Candidate*>(fItTrackInputArray->Next()))) {
         if (trk->Momentum.DeltaR(candidate->Momentum) < fParameterR) {
           float pt = trk->Momentum.Pt();
           sumpt += pt;
           sumptch += pt;
-          if (trk->IsPU) {
+          if (trk->IsPU && TMath::Abs(trk->Position.Z()-zvtx) > fZVertexResolution) {
             sumptchpu += pt;
           } else {

modules/PileUpJetID.h

@@ -53 +53 @@
 
   TObjArray *fOutputArray; //!
+  
+  TIterator *fItVertexInputArray; //!
+  const TObjArray *fVertexInputArray; //!
 
+  Double_t fZVertexResolution;
 
   ClassDef(PileUpJetID, 1)

modules/TrackPileUpSubtractor.cc

@@ -110 +110 @@
   while((candidate = static_cast<Candidate*>(fItVertexInputArray->Next())))
   {
-    if(candidate->IsPU == 0)
+    if(!candidate->IsPU)
     {
     zvtx = candidate->Position.Z();
-    break;
+    // break;
     }
   }
-
 
   // loop over all input arrays
@@ -130 +129 @@
       particle = static_cast<Candidate*>(candidate->GetCandidates()->At(0));
       z = particle->Position.Z();
-
+      
       // apply pile-up subtraction
       // assume perfect pile-up subtraction for tracks outside fZVertexResolution
+      
       if(candidate->IsPU && TMath::Abs(z-zvtx) > fZVertexResolution) continue;