Changeset fa7729a in git for readers/DelphesPythia8.cpp

Timestamp:

Aug 31, 2020, 12:22:36 PM (4 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

master

Children:

4692fd9

Parents:

1a8ef08 (diff), 4f52352 (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 branch 'master' of ​https://github.com/delphes/delphes

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)