Changeset 6049672 in git

Timestamp:

Jan 23, 2020, 8:59:46 PM (5 years ago)

Author:

Kaan Yüksel Oyulmaz <kaanyukseloyulmaz@…>

Branches:

Timing

Children:

4ac0049

Parents:

e70228d

Message:

New changes according to last meeting

Files:

• cards/FCC/FCChh_PileUpVtx.tcl (modified) (4 diffs)
• modules/PileUpSubtractor4D.cc (added)
• modules/PileUpSubtractor4D.h (added)
• modules/TimeSmearing.cc (modified) (5 diffs)
• modules/TimeSmearing.h (modified) (1 diff)
• modules/TrackPileUpSubtractor.cc (modified) (4 diffs)

cards/FCC/FCChh_PileUpVtx.tcl

@@ -48 +48 @@
 
   VertexFinderDA4D
-  TrackTimingPileUpSubtractor
+  PileUpSubtractor4D
 
   HighMassVertexRecover    
@@ -568 +568 @@
   set InputArray ECal/eflowPhotons
   set OutputArray timeSmearingPhotons
+  set TimeResolution {sqrt(20^2 + 150^2)/energy^2}
 }
 
@@ -579 +580 @@
 
   # assume 30 ps resolution for now
-  set TimeResolution {30E-12}
+  set TimeResolution {sqrt(20^2 + 150^2)/energy^2}
 }
 
@@ -619 +620 @@
 ##########################
 
-module TrackTimingPileUpSubtractor TrackTimingPileUpSubtractor {
+module PileUpSubtractor4D PileUpSubtractor4D {
 # add InputArray InputArray OutputArray
 

modules/TimeSmearing.cc

@@ -53 +53 @@
 
 TimeSmearing::TimeSmearing() :
-  fItInputArray(0)
+  fItInputArray(0), fFormula(0)
 {
+        fFormula = new DelphesFormula;
 }
 
@@ -61 +62 @@
 TimeSmearing::~TimeSmearing()
 {  
+        if(fFormula) delete fFormula;
 }
 
@@ -67 +69 @@
 void TimeSmearing::Init()
 {
-  // read resolution formula
-
-  fTimeResolution = GetDouble("TimeResolution", 1.);
+  // read resolution formula    
+  fFormula->Compile(GetString("TimeResolution", "0.001"));
 
   // import input array
@@ -94 +95 @@
   Double_t ti, tf_smeared, tf;
   Double_t pt, eta, phi, e, p, l;
-  Double_t sigma_t, beta_particle;
+  Double_t beta_particle;
+  Double_t timeResolution;
 
 
   const Double_t c_light = 2.99792458E8;
-
-  cout << " STARTINNNGG ---------->" << endl;
 
   fItInputArray->Reset();
@@ -117 +117 @@
     beta_particle = p/e;
     l = candidate->L;
-    // apply smearing formula
-
+    timeResolution = fFormula->Eval(e);
+    
     if(candidate->Charge != 0)
     { 
-      tf_smeared = tf + fTimeResolution*gRandom->Gaus(0, 1);
-      //mother = candidate;
-      //candidate = static_cast<Candidate*>(candidate->Clone());  // I am not sure that we need these lines !!!
-      //candidate->AddCandidate(mother);
+      tf_smeared = tf + timeResolution*gRandom->Gaus(0, 1);
+      mother = candidate;
+      candidate = static_cast<Candidate*>(candidate->Clone());  // I am not sure that we need these lines !!!
+      candidate->AddCandidate(mother);
       candidate->InitialPosition.SetT((100+ti)*1.0E3*c_light);
       candidate->Position.SetT(tf_smeared*1.0E3*c_light);
-      candidate->ErrorT = fTimeResolution*1.0E3*c_light;
+      candidate->ErrorT = timeResolution*1.0E3*c_light;
       fOutputArray->Add(candidate);
     }
     else
     {
-        sigma_t = sqrt(pow(20,2) + pow(150,2)/e);
-        ti = sigma_t - l*1.0E3/(c_light*beta_particle);   
-        candidate->InitialPosition.SetT(ti);
-        candidate->ErrorT = sigma_t*1.0E3*c_light;              // Do we need to sum with 100 like in upside ?
-        fOutputArray->Add(candidate);
+      ti = timeResolution - l*1.0E3/(c_light*beta_particle);   
+      candidate->InitialPosition.SetT(ti);
+      candidate->ErrorT = timeResolution*1.0E3*c_light;         // Do we need to sum with 100 like in upside ?
+      fOutputArray->Add(candidate);
     }
    

modules/TimeSmearing.h

@@ -45 +45 @@
 
 private:
-  Double_t fTimeResolution; //!
+  DelphesFormula *fFormula;
   Double_t fEtaMax;
 

modules/TrackPileUpSubtractor.cc

@@ -117 +117 @@
 void TrackPileUpSubtractor::Process()
 {
-  Candidate *candidate, *particle, *particleTest;
+  Candidate *candidate, *particle;
   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())))
   {
-      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;
-      }  
-      */
+    if(!candidate->IsPU)
+    {
+      zvtx = candidate->Position.Z();
+    }
   }
 
@@ -169 +146 @@
     {
       particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
-      const TLorentzVector &candidateMomentum = candidate->Momentum;
+      const TLorentzVector &candidateMomentum = particle->Momentum;
 
       eta = candidateMomentum.Eta();
@@ -176 +153 @@
       e = candidateMomentum.E();
 
-      z = candidate->Position.Z();
-      counter ++; 
-      //sum = pt*pt;
-      if(pt > 1.0)
-        sumPT2 += pt*pt;
+      z = particle->Position.Z();
 
       // apply pile-up subtraction
       // assume perfect pile-up subtraction for tracks outside fZVertexResolution
-      // 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)
+      if(candidate->Charge != 0 && candidate->IsPU && 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