- Timestamp:
- Aug 28, 2020, 5:29:36 PM (4 years ago)
- Branches:
- master
- Children:
- f0f1443
- Parents:
- d192152 (diff), a643a7f (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:
- Aleksander Filip Żarnecki <zarnecki@…> (08/28/20 17:29:36)
- git-committer:
- GitHub <noreply@…> (08/28/20 17:29:36)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
readers/DelphesPythia8.cpp
rd192152 raafe927 296 296 297 297 // jet matching 298 #if PYTHIA_VERSION_INTEGER < 8300 298 299 matching = combined->getHook(*pythia); 299 300 if(!matching) … … 302 303 } 303 304 pythia->setUserHooksPtr(matching); 305 #endif 304 306 305 307 if(pythia == NULL)
Note:
See TracChangeset
for help on using the changeset viewer.