Changeset 9e1e2eb in git

Timestamp:

Jan 20, 2020, 3:27:13 PM (5 years ago)

Author:

Kaan Yüksel Oyulmaz <kaanyukseloyulmaz@…>

Branches:

Timing

Children:

93bf9c6

Parents:

9c52415 (diff), 9867b49 (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.

Message:

Merge remote-tracking branch 'upstream/Timing'

Files:

• cards/FCC/FCChh_PileUpVtx.tcl (modified) (4 diffs)
• classes/DelphesClasses.cc (modified) (3 diffs)
• classes/DelphesClasses.h (modified) (3 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/TreeWriter.cc (modified) (2 diffs)

cards/FCC/FCChh_PileUpVtx.tcl

@@ -28 +28 @@
   MuonMomentumSmearing
 
+  EnergyLoss
+
   TrackMerger
+
 
   TrackSmearing
@@ -142 +145 @@
   set Bz 4.0
 }
-
 
 
@@ -245 +247 @@
 }
 
+#################################
+# Charged Energy Loss (dE/dx)
+#################################
+
+module EnergyLoss EnergyLoss {
+  add InputArray ChargedHadronMomentumSmearing/chargedHadrons
+  add InputArray ElectronMomentumSmearing/electrons
+  add InputArray MuonMomentumSmearing/muons
+}
+
 ##############
 # Track merger
@@ -256 +268 @@
   set OutputArray tracks
 }
+
 
 

classes/DelphesClasses.cc

@@ -148 +148 @@
   Phi(0), ErrorPhi(0),
   Xd(0), Yd(0), Zd(0), Td(0),
+  DeDx(0),
   VertexingWeight(0),
   TrackResolution(0),
@@ -306 +307 @@
   object.Area = Area;
   object.L = L;
+  object.DeDx = DeDx;
   object.ErrorT = ErrorT;
   object.D0 = D0;
@@ -437 +439 @@
   Area.SetXYZT(0.0, 0.0, 0.0, 0.0);
   L = 0.0;
+  DeDx = 0.0;
   ErrorT = 0.0;
   D0 = 0.0;

classes/DelphesClasses.h

@@ -477 +477 @@
   Float_t ErrorDZ; // track longitudinal impact parameter error
 
+  Float_t DeDx; // track charged energy loss in MeV/cm
+
   TRef Particle; // reference to generated particle
 
@@ -567 +569 @@
 
   Int_t VertexIndex; // reference to vertex
+
+  Float_t DeDx; // track charged energy loss in MeV/cm
 
   static CompBase *fgCompare; //!
@@ -674 +678 @@
   Float_t Zd;
 
+  // PID variables
+  Float_t DeDx; // track charged energy loss in MeV/cm
+
+
   // Vertexing variables
   Float_t VertexingWeight;

modules/ModulesLinkDef.h

@@ -32 +32 @@
 #include "modules/ParticlePropagator.h"
 #include "modules/Efficiency.h"
+#include "modules/EnergyLoss.h"
 #include "modules/IdentificationMap.h"
 #include "modules/EnergySmearing.h"
@@ -88 +89 @@
 #pragma link C++ class ParticlePropagator+;
 #pragma link C++ class Efficiency+;
+#pragma link C++ class EnergyLoss+;
 #pragma link C++ class IdentificationMap+;
 #pragma link C++ class EnergySmearing+;

modules/TreeWriter.cc

@@ -346 +346 @@
 
     entry->L = candidate->L;
+    entry->DeDx = candidate->DeDx; // in MeV/cm
 
     entry->D0 = candidate->D0;
@@ -492 +493 @@
 
     entry->L = candidate->L;
+    entry->DeDx = candidate->DeDx;
 
     entry->D0 = candidate->D0;