Changeset 54b6dfc in git for modules/PileUpJetID.cc

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

File:

• modules/PileUpJetID.cc (modified) (6 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 {