Changeset 1323 in svn for trunk

Timestamp:

Nov 8, 2013, 5:09:58 PM (11 years ago)

Author:

Pavel Demin

Message:

add vertex block

Location:

trunk

Files:

• classes/ClassesLinkDef.h (modified) (1 diff)
• classes/DelphesClasses.h (modified) (1 diff)
• examples/delphes_card_CMS_PileUp.tcl (modified) (1 diff)
• modules/PileUpMerger.cc (modified) (4 diffs)
• modules/PileUpMerger.h (modified) (1 diff)
• modules/TreeWriter.cc (modified) (3 diffs)
• modules/TreeWriter.h (modified) (1 diff)

trunk/classes/ClassesLinkDef.h

@@ -34 +34 @@
 #pragma link C++ class HepMCEvent+;
 #pragma link C++ class GenParticle+;
+#pragma link C++ class Vertex+;
 #pragma link C++ class MissingET+;
 #pragma link C++ class ScalarHT+;

trunk/classes/DelphesClasses.h

@@ -144 +144 @@
 //---------------------------------------------------------------------------
 
+class Vertex: public TObject
+{
+public:
+  Float_t T; // vertex position (t component)
+  Float_t X; // vertex position (x component)
+  Float_t Y; // vertex position (y component)
+  Float_t Z; // vertex position (z component)
+
+  ClassDef(Vertex, 1)
+};
+
+//---------------------------------------------------------------------------
+
 class MissingET: public TObject
 {

trunk/examples/delphes_card_CMS_PileUp.tcl

@@ -631 +631 @@
   add Branch ScalarHT/energy ScalarHT ScalarHT
   add Branch Rho/rho Rho Rho
-}
-
+  add Branch PileUpMerger/Vertices Vertex Vertex
+}
+

trunk/modules/PileUpMerger.cc

@@ -70 +70 @@
 
   // create output arrays
-  fOutputArray = ExportArray(GetString("OutputArray", "stableParticles"));
+  fParticleOutputArray = ExportArray(GetString("ParticleOutputArray", "stableParticles"));
+  fVertexOutputArray = ExportArray(GetString("VertexOutputArray", "vertices"));
 }
 
@@ -98 +99 @@
   while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
   {
-    fOutputArray->Add(candidate);
+    fParticleOutputArray->Add(candidate);
   }
 
@@ -131 +132 @@
     dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi());
 
+    candidate = factory->NewCandidate();
+    candidate->Position.SetXYZT(0.0, 0.0, dz, 0.0);
+    fVertexOutputArray->Add(candidate);
+
     while(fReader->ReadParticle(pid, x, y, z, t, px, py, pz, e))
     {
@@ -151 +156 @@
       candidate->Position.RotateZ(dphi);
 
-      fOutputArray->Add(candidate);
+      fParticleOutputArray->Add(candidate);
     }
   }

trunk/modules/PileUpMerger.h

@@ -43 +43 @@
   const TObjArray *fInputArray; //!
 
-  TObjArray *fOutputArray; //!
+  TObjArray *fParticleOutputArray; //!
+  TObjArray *fVertexOutputArray; //!
 
   ClassDef(PileUpMerger, 1)

trunk/modules/TreeWriter.cc

@@ -213 +213 @@
 //------------------------------------------------------------------------------
 
+void TreeWriter::ProcessVertices(ExRootTreeBranch *branch, TObjArray *array)
+{
+  TIter iterator(array);
+  Candidate *candidate = 0;
+  Vertex *entry = 0;
+
+  // loop over all vertices
+  iterator.Reset();
+  while((candidate = static_cast<Candidate*>(iterator.Next())))
+  {
+    const TLorentzVector &position = candidate->Position;
+
+    entry = static_cast<Vertex*>(branch->NewEntry());
+
+    entry->X = position.X();
+    entry->Y = position.Y();
+    entry->Z = position.Z();
+    entry->T = position.T();
+  }
+}
+
+//------------------------------------------------------------------------------
+
 void TreeWriter::ProcessTracks(ExRootTreeBranch *branch, TObjArray *array)
 {
@@ -221 +244 @@
   Double_t pt, signz, cosTheta, eta, rapidity;
 
-  // loop over all jets
+  // loop over all tracks
   iterator.Reset();
   while((candidate = static_cast<Candidate*>(iterator.Next())))
@@ -280 +303 @@
   Double_t pt, signPz, cosTheta, eta, rapidity;
 
-  // loop over all jets
+  // loop over all towers
   iterator.Reset();
   while((candidate = static_cast<Candidate*>(iterator.Next())))

trunk/modules/TreeWriter.h

@@ -41 +41 @@
 
   void ProcessParticles(ExRootTreeBranch *branch, TObjArray *array);
+  void ProcessVertices(ExRootTreeBranch *branch, TObjArray *array);
   void ProcessTracks(ExRootTreeBranch *branch, TObjArray *array);
   void ProcessTowers(ExRootTreeBranch *branch, TObjArray *array);