Fork me on GitHub

Ignore:
Timestamp:
Dec 9, 2014, 1:26:26 PM (10 years ago)
Author:
Michele <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
49234af
Parents:
01f457a (diff), f6b6ee7 (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:

Merge branch 'master' into TestFastJet310b1

Conflicts:

Makefile
examples/Example1.C
examples/Example2.C
examples/Example3.C

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/PileUpMergerPythia8.cc

    r01f457a re7e90df  
    132132    dphi = gRandom->Uniform(-TMath::Pi(), TMath::Pi());
    133133
    134     for(i = 0; i < fPythia->event.size(); ++i)
     134    for(i = 1; i < fPythia->event.size(); ++i)
    135135    {
    136136      Pythia8::Particle &particle = fPythia->event[i];
Note: See TracChangeset for help on using the changeset viewer.