Changeset aafe927 in git for readers

Timestamp:

Aug 28, 2020, 5:29:36 PM (4 years ago)

Author:

GitHub <noreply@…>

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)

Message:

Merge pull request #1 from delphes/master

Updating my fork

File:

• readers/DelphesPythia8.cpp (modified) (2 diffs)

readers/DelphesPythia8.cpp

@@ -296 +296 @@
 
     // jet matching
+#if PYTHIA_VERSION_INTEGER < 8300
     matching = combined->getHook(*pythia);
     if(!matching)
@@ -302 +303 @@
     }
     pythia->setUserHooksPtr(matching);
+#endif
 
     if(pythia == NULL)