Changeset d4e5b6a in git for modules

Timestamp:

Dec 12, 2019, 3:16:58 PM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

Timing

Children:

03b9c0f, 83ee320, b4a3c55

Parents:

2b5ff2c (diff), 584e2e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michele Selvaggi <michele.selvaggi@…> (12/12/19 15:16:58)

git-committer:

GitHub <noreply@…> (12/12/19 15:16:58)

Message:

Merge pull request #4 from kaanyuxel/master

Addıng various timing related updates

Location:

modules

Files:

• .DS_Store (added)
• HighMassVertexRecover.cc (added)
• HighMassVertexRecover.h (added)
• ModulesLinkDef.h (modified) (4 diffs)
• TrackPileUpSubtractor.cc (modified) (4 diffs)
• TrackTimingPileUpSubtractor.cc (added)
• TrackTimingPileUpSubtractor.h (added)

modules/ModulesLinkDef.h

@@ -56 +56 @@
 #include "modules/JetPileUpSubtractor.h"
 #include "modules/TrackPileUpSubtractor.h"
+#include "modules/TrackTimingPileUpSubtractor.h"
 #include "modules/TaggingParticlesSkimmer.h"
 #include "modules/PileUpJetID.h"
@@ -72 +73 @@
 #include "modules/VertexFinder.h"
 #include "modules/VertexFinderDA4D.h"
+#include "modules/HighMassVertexRecover.h"
 #include "modules/DecayFilter.h"
 #include "modules/ExampleModule.h"
@@ -111 +113 @@
 #pragma link C++ class JetPileUpSubtractor+;
 #pragma link C++ class TrackPileUpSubtractor+;
+#pragma link C++ class TrackTimingPileUpSubtractor+;
 #pragma link C++ class TaggingParticlesSkimmer+;
 #pragma link C++ class PileUpJetID+;
@@ -127 +130 @@
 #pragma link C++ class VertexFinder+;
 #pragma link C++ class VertexFinderDA4D+;
+#pragma link C++ class HighMassVertexRecover+;
 #pragma link C++ class DecayFilter+;
 #pragma link C++ class ExampleModule+;

modules/TrackPileUpSubtractor.cc

@@ -117 +117 @@
 void TrackPileUpSubtractor::Process()
 {
-  Candidate *candidate, *particle;
+  Candidate *candidate, *particle, *particleTest;
   map<TIterator *, TObjArray *>::iterator itInputMap;
   TIterator *iterator;
@@ -123 +123 @@
   Double_t z, zvtx = 0;
   Double_t pt, eta, phi, e;
-
+  Double_t sumPT2 = 0;
+  Double_t sumSquare = 0;
+  int counter = 0;
+  Double_t tempPTSquare = 0;
+  Double_t tempZVertex = 0; 
   // find z position of primary vertex
 
+  cout << " ---------- NEW EVENT --------- " << endl; 
+
   fItVertexInputArray->Reset();
+  cout << " NUMBER OF VERTICES : " << fVertexInputArray->GetEntriesFast() << endl;
   while((candidate = static_cast<Candidate *>(fItVertexInputArray->Next())))
   {
-    if(!candidate->IsPU)
-    {
-      zvtx = candidate->Position.Z();
-      // break;
-    }
+      cout << " ---------- NEW VERTEX --------- " << candidate->IsPU << endl; 
+      tempZVertex = candidate->Position.Z();
+      tempPTSquare = candidate->SumPT2;
+      if(tempPTSquare > sumSquare)
+      {
+        sumSquare = tempPTSquare;
+        zvtx = tempZVertex;
+        cout << " Sum Square : " << sumSquare << " Z of Vertex : " << zvtx << "  Is PileUp : " << candidate->IsPU << endl;
+      } 
+      
+      /*
+      for(int i = 0; i < candidate->GetCandidates()->GetEntriesFast(); i++)
+      {
+        particleTest = static_cast<Candidate *>(candidate->GetCandidates()->At(i));
+        TLorentzVector &candidateMomentumNew = particleTest->Momentum;
+        if(candidateMomentumNew.Pt() > 1.0)
+          sumSquare += (candidateMomentumNew.Pt()*candidateMomentumNew.Pt());
+        cout << candidateMomentumNew.Pt() << "  " << candidate->SumPT2 << " counter : " << candidate->GetCandidates()->GetEntriesFast() << endl;
+      }  
+      */
   }
 
@@ -147 +169 @@
     {
       particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
-      const TLorentzVector &candidateMomentum = particle->Momentum;
+      const TLorentzVector &candidateMomentum = candidate->Momentum;
 
       eta = candidateMomentum.Eta();
@@ -154 +176 @@
       e = candidateMomentum.E();
 
-      z = particle->Position.Z();
+      z = candidate->Position.Z();
+      counter ++; 
+      //sum = pt*pt;
+      if(pt > 1.0)
+        sumPT2 += pt*pt;
 
       // apply pile-up subtraction
       // assume perfect pile-up subtraction for tracks outside fZVertexResolution
-
-      if(candidate->Charge != 0 && candidate->IsPU && TMath::Abs(z - zvtx) > fFormula->Eval(pt, eta, phi, e) * 1.0e3)
+      // cout << particle->IsRecoPU << " ParticleSumSquare : " << sumPT2 << " VertexResult : " << sumSquare << " Added SumSquare : " << zvtx << endl;
+      //cout << pt << "  " << candidate->IsPU << "  " <<  TMath::Abs(z - zvtx) << "   " << sumPT2 << "   " << sumPT2 << endl;
+
+      
+      if(particle->Charge != 0 && TMath::Abs(z - zvtx) > fFormula->Eval(pt, eta, phi, e) * 1.0e3)
       {
         candidate->IsRecoPU = 1;
+        //cout <<  TMath::Abs(z - zvtx) << "   " << fFormula->Eval(pt, eta, phi, e) * 1.0e3 << endl;
       }
       else