Changeset 2600216 in git

Timestamp:

May 17, 2016, 3:13:43 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3f7ef54

Parents:

4569b59

Message:

added variables for vertexing

Files:

• classes/DelphesClasses.h (modified) (1 diff)
• modules/TreeWriter.cc (modified) (2 diffs)
• modules/VertexFinder.cc (modified) (3 diffs)
• modules/VertexFinder.h (modified) (2 diffs)

classes/DelphesClasses.h

@@ -453 +453 @@
   TRef Particle; // reference to generated particle
 
+  Int_t VertexIndex; // reference to vertex
+  
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }

modules/TreeWriter.cc

@@ -244 +244 @@
 
   const Double_t c_light = 2.99792458E8;
-
+ 
+  Double_t x, y, z, t, xError, yError, zError, sigma, sumPT2, btvSumPT2, genDeltaZ, genSumPT2;
+  UInt_t index, ndf;
+ 
   // loop over all vertices
   iterator.Reset();
   while((candidate = static_cast<Candidate*>(iterator.Next())))
   {
-    const TLorentzVector &position = candidate->Position;
+   
+    index = candidate->ClusterIndex;
+    ndf = candidate->ClusterNDF;
+    sigma = candidate->ClusterSigma;
+    sumPT2 = candidate->SumPT2;
+    btvSumPT2 = candidate->BTVSumPT2;
+    genDeltaZ = candidate->GenDeltaZ;
+    genSumPT2 = candidate->GenSumPT2;
+
+    x = candidate->Position.X ();
+    y = candidate->Position.Y ();
+    z = candidate->Position.Z ();
+    t = candidate->Position.T()*1.0E-3/c_light;
+  
+    xError = candidate->PositionError.X ();
+    yError = candidate->PositionError.Y ();
+    zError = candidate->PositionError.Z ();
 
     entry = static_cast<Vertex*>(branch->NewEntry());
 
-    entry->X = position.X();
-    entry->Y = position.Y();
-    entry->Z = position.Z();
-    entry->T = position.T()*1.0E-3/c_light;
-  }
-}
+    entry->Index = index;
+    entry->NDF = ndf;
+    entry->Sigma = sigma;
+    entry->SumPT2 = sumPT2;
+    entry->BTVSumPT2 = btvSumPT2;
+    entry->GenDeltaZ = genDeltaZ;
+    entry->GenSumPT2 = genSumPT2;
+  
+    entry->X = x;
+    entry->Y = y;
+    entry->Z = z;
+    entry->T = t;
+    
+    entry->ErrorX = xError;
+    entry->ErrorY = yError;
+    entry->ErrorZ = zError;
+  }
+}
+
 
 //------------------------------------------------------------------------------
@@ -337 +369 @@
 
     entry->Particle = particle;
+
+    entry->VertexIndex = candidate->ClusterIndex;
+
   }
 }

modules/VertexFinder.cc

@@ -1 +1 @@
 /** \class VertexFinder
  *
- *  Merges particles from pile-up sample into event
- *
- *
- *  $Date: 2013-02-12 15:13:59 +0100 (Tue, 12 Feb 2013) $
- *  $Revision: 907 $
- *
+ *  Cluster vertices from tracks
  *
  *  \author M. Selvaggi - UCL, Louvain-la-Neuve
  *
  */
+
 
 #include "modules/VertexFinder.h"
@@ -70 +66 @@
 
   fOutputArray = ExportArray(GetString("OutputArray", "tracks"));
-  fClusterOutputArray = ExportArray(GetString("ClusterOutputArray", "clusters"));
+  fVertexOutputArray = ExportArray(GetString("VertexOutputArray", "vertices"));
 }
 
@@ -183 +179 @@
     candidate->PositionError.SetXYZT(0.0, 0.0, clusterIDToDouble.at (cluster->first).at ("ez"), 0.0);
 
-    fClusterOutputArray->Add(candidate);
+    fVertexOutputArray->Add(candidate);
   }
 ////////////////////////////////////////////////////////////////////////////////

modules/VertexFinder.h

@@ -4 +4 @@
 /** \class VertexFinder
  *
- *  Merges particles from pile-up sample into event
- *
- *
- *  $Date: 2013-02-12 15:13:59 +0100 (Tue, 12 Feb 2013) $
- *  $Revision: 907 $
- *
+ *  Cluster vertices from tracks
  *
  *  \author M. Selvaggi - UCL, Louvain-la-Neuve
@@ -63 +58 @@
 
   TObjArray *fOutputArray;
-  TObjArray *fClusterOutputArray;
+  TObjArray *fVertexOutputArray;
 
   map<unsigned, map<string, double> > trackIDToDouble;