Changeset 03b9c0f in git for modules

Timestamp:

Jan 6, 2020, 10:13:21 PM (5 years ago)

Author:

Kaan Yüksel Oyulmaz <kaanyukseloyulmaz@…>

Branches:

Timing

Children:

7939c6c

Parents:

d4e5b6a

Message:

New Time Smearing Module for Neutral Particles and FCC-hh Detector Card Update

Location:

modules

Files:

• ModulesLinkDef.h (modified) (4 diffs)
• TimeSmearingNeutral.cc (added)
• TimeSmearingNeutral.h (added)
• TrackTimingPileUpSubtractor.cc (modified) (4 diffs)
• TrackTimingPileUpSubtractor.h (modified) (1 diff)
• VertexFinderDA4D.cc (modified) (1 diff)

modules/ModulesLinkDef.h

@@ -38 +38 @@
 #include "modules/ImpactParameterSmearing.h"
 #include "modules/TimeSmearing.h"
+#include "modules/TimeSmearingNeutral.h"
 #include "modules/SimpleCalorimeter.h"
 #include "modules/DenseTrackFilter.h"
@@ -55 +56 @@
 #include "modules/PileUpMerger.h"
 #include "modules/JetPileUpSubtractor.h"
-#include "modules/TrackPileUpSubtractor.h"
 #include "modules/TrackTimingPileUpSubtractor.h"
 #include "modules/TaggingParticlesSkimmer.h"
@@ -95 +95 @@
 #pragma link C++ class ImpactParameterSmearing+;
 #pragma link C++ class TimeSmearing+;
+#pragma link C++ class TimeSmearingNeutral+;
 #pragma link C++ class SimpleCalorimeter+;
 #pragma link C++ class DenseTrackFilter+;
@@ -112 +113 @@
 #pragma link C++ class PileUpMerger+;
 #pragma link C++ class JetPileUpSubtractor+;
-#pragma link C++ class TrackPileUpSubtractor+;
 #pragma link C++ class TrackTimingPileUpSubtractor+;
 #pragma link C++ class TaggingParticlesSkimmer+;

modules/TrackTimingPileUpSubtractor.cc

@@ -75 +75 @@
 
   // read resolution formula in m
-  fFormula->Compile(GetString("ZVertexResolution", "0.001"));
+  fZVertexResolution = GetDouble("ZVertexResolution", 3);
+  fTVertexResolution = GetDouble("TVertexResolution", 3);
 
   fPTMin = GetDouble("PTMin", 0.);
@@ -128 +129 @@
   Double_t tempPTSquare = 0;
   Double_t pt, eta, phi, e;
-  Double_t distance = 0;
+  Double_t distanceCharged, distanceNeutral = 0;
 
   // find z position of primary vertex
@@ -143 +144 @@
       tvtx = candidate->Position.T();
       tvtx_err = candidate->PositionError.T();
-      cout << " initial : " << candidate->InitialPosition.T() << " final : " << candidate->Position.T() << endl;
     } 
   }
@@ -167 +167 @@
       z = particle->Position.Z();
       z_err = particle->PositionError.Z();
-      t = particle->Position.T();
+      t = particle->InitialPosition.T();
       t_err = particle->PositionError.T();
 
-      // apply pile-up subtraction
-      distance = pow((zvtx - z),2)/pow((zvtx_err - z_err),2) + pow((tvtx - t),2)/pow((tvtx_err - t_err),2);
-      //cout << " t : " << tvtx << "  t(particle)" << t << endl;
-      // here I calculated distance using Z and T of selected vertex (highest sum Pt square) and particles
-      // however z_err of vertices is gives 0 because of using CMS trackResolutionCMS.tcl (in that formula, there is limitation on |eta| < 2.5)
-      // thats why I used TMath::Abs(z - zvtx) < 0.005 && TMath::Abs(t - tvtx) < 5.0
+      distanceCharged = pow((zvtx - z),2)/pow((zvtx_err - z_err),2) + pow((tvtx - t),2)/pow((tvtx_err - t_err),2);
+      distanceNeutral = pow((tvtx - t),2)/pow((tvtx_err - t_err),2);
 
-      if(candidate->Charge != 0 && TMath::Abs(z - zvtx) < 0.005 && TMath::Abs(t - tvtx) < 5.0)
+      if(candidate->Charge != 0 && distanceCharged < fZVertexResolution)
       {
         candidate->IsRecoPU = 1;
       }
+      else if(candidate->Charge == 0 && distanceNeutral < fTVertexResolution)
+      {
+        candidate->IsRecoPU = 1;
+      }  
       else
       {

modules/TrackTimingPileUpSubtractor.h

@@ -49 +49 @@
   DelphesFormula *fFormula; //!
 
+  Double_t fZVertexResolution;
+  Double_t fTVertexResolution;
+
   Double_t fPTMin;
 

modules/VertexFinderDA4D.cc

@@ -425 +425 @@
     candidate->ClusterIndex = k;
     candidate->Position.SetXYZT(0.0, 0.0, vtx.z[k] , vtx.t[k]*1E-9*c_light);
+    candidate->InitialPosition.SetXYZT(0.0, 0.0, vtx.z[k] , vtx.t[k]*1E-9*c_light);    
     candidate->PositionError.SetXYZT(0.0, 0.0, fVertexZSize , fVertexTSize*1E-9*c_light);
     candidate->SumPT2 = 0;