Fork me on GitHub

Changeset 9327245 in git for readers


Ignore:
Timestamp:
Aug 23, 2016, 3:58:42 PM (8 years ago)
Author:
GitHub <noreply@…>
Parents:
98ce52a (diff), 20ca0cd (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.
git-author:
AlexandreMertens <alexandre.mertens@…> (08/23/16 15:58:42)
git-committer:
GitHub <noreply@…> (08/23/16 15:58:42)
Message:

Merge 20ca0cd9f4c77e04149db66434b1a6f0bb59334c into 98ce52a7df661abe0f07360a4d82aba1f0496c6a

File:
1 edited

Legend:

Unmodified
Added
Removed
  • readers/DelphesPythia8.cpp

    r98ce52a r9327245  
    338338      if (pythia->flag("Main:spareFlag1"))
    339339      {
    340         if (pythia->mode("Main:spareMode1") == 11 || pythia->mode("Main:spareMode1") == 13 || pythia->mode("Main:spareMode1") == 22)
     340        if (pythia->mode("Main:spareMode1") == 11 || pythia->mode("Main:spareMode1") == 13 || pythia->mode("Main:spareMode1") == 15 || pythia->mode("Main:spareMode1") == 22)
    341341        {
    342342          fillParticle( pythia->mode("Main:spareMode1"), pythia->parm("Main:spareParm1"), -1., 0.,pythia->event, pythia->particleData, pythia->rndm, 0);
Note: See TracChangeset for help on using the changeset viewer.