Changeset 80763ac in git

Timestamp:

Aug 20, 2020, 8:17:30 AM (4 years ago)

Author:

GitHub <noreply@…>

Children:

b8a84d7, ba88abf

Parents:

46c8df8 (diff), 5eb063e (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:

Roberto Preghenella <preghenella@…> (08/20/20 08:17:30)

git-committer:

GitHub <noreply@…> (08/20/20 08:17:30)

Message:

Merge pull request #1 from preghenella/rdev-pythia8302

Temporary fix UserHooks API changed in Pythia 8.3 series

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)