Fork me on GitHub

Changeset 3e2bb2b in git for modules


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • modules/PileUpMerger.cc

    r62d3bc5 r3e2bb2b  
    168168    candidate->Position.SetT(t - dt0 + dt);
    169169
     170    candidate->IsPU = 0;
     171
    170172    fParticleOutputArray->Add(candidate);
    171173
     
    190192  vertex->SumPT2 = sumpt2;
    191193  vertex->GenSumPT2 = sumpt2;
    192 
    193194  fVertexOutputArray->Add(vertex);
    194195
     
    213214  allEntries = fReader->GetEntries();
    214215
     216
    215217  for(event = 0; event < numberOfEvents; ++event)
    216218  {
     
    238240    sumpt2 = 0.0;
    239241
     242    //factory = GetFactory();
    240243    vertex = factory->NewCandidate();
    241244
     
    256259      candidate->Momentum.SetPxPyPzE(px, py, pz, e);
    257260      candidate->Momentum.RotateZ(dphi);
     261      pt = candidate->Momentum.Pt();
    258262
    259263      x -= fInputBeamSpotX;
  • modules/TreeWriter.cc

    r62d3bc5 r3e2bb2b  
    248248  UInt_t index, ndf;
    249249
     250  CompBase *compare = Candidate::fgCompare;
     251  Candidate::fgCompare = CompSumPT2<Candidate>::Instance();
    250252  array->Sort();
     253  Candidate::fgCompare = compare;
    251254
    252255  // loop over all vertices
     
    291294    entry->ErrorZ = zError;
    292295
     296
    293297    TIter itConstituents(candidate->GetCandidates());
    294 
     298    itConstituents.Reset();
     299    entry->Constituents.Clear();
    295300    while((constituent = static_cast<Candidate*>(itConstituents.Next())))
    296301    {
Note: See TracChangeset for help on using the changeset viewer.