Changeset 70b9632 in git for classes/DelphesClasses.h

Timestamp:

Aug 25, 2016, 2:04:58 PM (8 years ago)

Author:

Alexandre Mertens <alexandre.mertens@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

629e819

Parents:

7bb13cd (diff), 1408174 (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:

dev_01

File:

• classes/DelphesClasses.h (modified) (10 diffs)

classes/DelphesClasses.h

@@ -147 +147 @@
   Float_t Pz; // particle momentum vector (z component) | hepevt.phep[number][2]
 
-  Float_t PT; // particle transverse momentum
+  Float_t D0;
+  Float_t DZ;
+  Float_t P;
+  Float_t PT;
+  Float_t CtgTheta;
+  Float_t Phi;
   Float_t Eta; // particle pseudorapidity
-  Float_t Phi; // particle azimuthal angle
-
   Float_t Rapidity; // particle rapidity
 
@@ -168 +171 @@
 //---------------------------------------------------------------------------
 
-class Vertex: public TObject
+class Vertex: public SortableObject
 {
 public:
@@ -176 +179 @@
   Float_t Z; // vertex position (z component)
 
-  ClassDef(Vertex, 1)
+  Double_t ErrorX;
+  Double_t ErrorY;
+  Double_t ErrorZ;
+  Double_t ErrorT;
+
+  Int_t Index;
+  Int_t NDF;
+  Double_t Sigma;
+  Double_t SumPT2;
+  Double_t BTVSumPT2;
+  Double_t GenDeltaZ;
+  Double_t GenSumPT2;
+
+  TRefArray Constituents; // references to constituents
+
+  static CompBase *fgCompare; //!
+  const CompBase *GetCompare() const { return fgCompare; }
+
+  ClassDef(Vertex, 3)
 };
 
@@ -397 +418 @@
   Int_t Charge; // track charge
 
-  Float_t PT; // track transverse momentum
-
   Float_t Eta; // track pseudorapidity
-  Float_t Phi; // track azimuthal angle
 
   Float_t EtaOuter; // track pseudorapidity at the tracker edge
@@ -415 +433 @@
   Float_t TOuter; // track position (z component) at the tracker edge
 
-  Float_t Dxy;     // track signed transverse impact parameter
-  Float_t SDxy;    // signed error on the track signed transverse impact parameter
+  Float_t L; // track path length
+  Float_t ErrorT; // error on the time measurement
+
+  Float_t D0;     // track signed transverse impact parameter
+  Float_t ErrorD0;    // signed error on the track signed transverse impact parameter
+
+  Float_t DZ; // track transverse momentum
+  Float_t ErrorDZ; // track transverse momentum error
+
+  Float_t P; // track transverse momentum
+  Float_t ErrorP; // track transverse momentum error
+
+  Float_t PT; // track transverse momentum
+  Float_t ErrorPT; // track transverse momentum error
+
+  Float_t CtgTheta; // track transverse momentum
+  Float_t ErrorCtgTheta; // track transverse momentum error
+
+  Float_t Phi; // track azimuthal angle
+  Float_t ErrorPhi; // track azimuthal angle
+
   Float_t Xd;      // X coordinate of point of closest approach to vertex
   Float_t Yd;      // Y coordinate of point of closest approach to vertex
@@ -423 +460 @@
   TRef Particle; // reference to generated particle
 
+  Int_t VertexIndex; // reference to vertex
+
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }
@@ -526 +565 @@
   Float_t DeltaPhi;
 
-  TLorentzVector Momentum, Position, Area;
-
-  Float_t Dxy;
-  Float_t SDxy;
+  TLorentzVector Momentum, Position, InitialPosition, PositionError, Area;
+
+  Float_t L; // path length
+  Float_t ErrorT; // path length
+  Float_t D0;
+  Float_t ErrorD0;
+  Float_t DZ;
+  Float_t ErrorDZ;
+  Float_t P;
+  Float_t ErrorP;
+  Float_t PT;
+  Float_t ErrorPT;
+  Float_t CtgTheta;
+  Float_t ErrorCtgTheta;
+  Float_t Phi;
+  Float_t ErrorPhi;
+
   Float_t Xd;
   Float_t Yd;
@@ -535 +587 @@
 
   // tracking resolution
-  
+
   Float_t TrackResolution;
 
@@ -562 +614 @@
   Float_t SumPt;
 
+  // vertex variables
+
+  Int_t ClusterIndex;
+  Int_t ClusterNDF;
+  Double_t ClusterSigma;
+  Double_t SumPT2;
+  Double_t BTVSumPT2;
+  Double_t GenDeltaZ;
+  Double_t GenSumPT2;
+
   // N-subjettiness variables
 
@@ -595 +657 @@
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 
-  ClassDef(Candidate, 4)
+  ClassDef(Candidate, 5)
 };