Changeset 3e2bb2b in git for modules

Timestamp:

Jun 20, 2016, 4:00:51 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

332025f

Parents:

62d3bc5

Message:

fixed vertex refs

Location:

modules

Files:

• PileUpMerger.cc (modified) (5 diffs)
• TreeWriter.cc (modified) (2 diffs)

modules/PileUpMerger.cc

@@ -168 +168 @@
     candidate->Position.SetT(t - dt0 + dt);
 
+    candidate->IsPU = 0;
+
     fParticleOutputArray->Add(candidate);
 
@@ -190 +192 @@
   vertex->SumPT2 = sumpt2;
   vertex->GenSumPT2 = sumpt2;
-
   fVertexOutputArray->Add(vertex);
 
@@ -213 +214 @@
   allEntries = fReader->GetEntries();
 
+
   for(event = 0; event < numberOfEvents; ++event)
   {
@@ -238 +240 @@
     sumpt2 = 0.0;
 
+    //factory = GetFactory();
     vertex = factory->NewCandidate();
 
@@ -256 +259 @@
       candidate->Momentum.SetPxPyPzE(px, py, pz, e);
       candidate->Momentum.RotateZ(dphi);
+      pt = candidate->Momentum.Pt();
 
       x -= fInputBeamSpotX;

modules/TreeWriter.cc

@@ -248 +248 @@
   UInt_t index, ndf;
 
+  CompBase *compare = Candidate::fgCompare;
+  Candidate::fgCompare = CompSumPT2<Candidate>::Instance();
   array->Sort();
+  Candidate::fgCompare = compare;
 
   // loop over all vertices
@@ -291 +294 @@
     entry->ErrorZ = zError;
 
+
     TIter itConstituents(candidate->GetCandidates());
-
+    itConstituents.Reset();
+    entry->Constituents.Clear();
     while((constituent = static_cast<Candidate*>(itConstituents.Next())))
     {