add code for jet matching in pythia > v8.3

key4hep · Dec 19, 2024 · 32d92d2 · 32d92d2
1 parent 3fb3f9f
commit 32d92d2
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/standalone/src/DelphesPythia8Reader.h b/standalone/src/DelphesPythia8Reader.h
@@ -58,11 +58,17 @@ class DelphesPythia8Reader : public DelphesInputReader {
 
     // jet matching
 #if PYTHIA_VERSION_INTEGER < 8300
+    Pythia8::CombineMatchingInput* combined   = 0;
+    Pythia8::UserHooks*            m_matching = 0;
+
     m_matching = combined->getHook(*m_pythia);
     if (!m_matching) {
       throw std::runtime_error("can't do matching");
     }
     m_pythia->setUserHooksPtr(m_matching);
+#else
+    Pythia8::CombineMatchingInput combined;
+    combined.setHook(*m_pythia);
 #endif
 
     if (!m_pythia) {
@@ -190,12 +196,8 @@ class DelphesPythia8Reader : public DelphesInputReader {
   TClonesArray* m_branchParticle;
   TClonesArray* m_branchHepMCEvent;
 
-  // for matching
-  Pythia8::CombineMatchingInput* combined   = 0;
-  Pythia8::UserHooks*            m_matching = 0;
-
   //resonance decayfilter
   Pythia8::ResonanceDecayFilterHook* m_resonanceDecayFilterHook{nullptr};
 };
 
-#endif
+#endif