Fork me on GitHub

Changeset 25291dd in git for readers/DelphesPythia8.cpp


Ignore:
Timestamp:
Oct 17, 2020, 4:05:03 AM (4 years ago)
Author:
Stephen Sekula <sekula@…>
Children:
44f4a4e
Parents:
4e5ed02 (diff), be1a3be (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 remote-tracking branch 'upstream/master'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • readers/DelphesPythia8.cpp

    r4e5ed02 r25291dd  
    296296
    297297    // jet matching
     298#if PYTHIA_VERSION_INTEGER < 8300
    298299    matching = combined->getHook(*pythia);
    299300    if(!matching)
     
    302303    }
    303304    pythia->setUserHooksPtr(matching);
     305#endif
    304306
    305307    if(pythia == NULL)
Note: See TracChangeset for help on using the changeset viewer.