adapt interface to pythia8 302

cms-sw · May 27, 2020 · b7ef199 · b7ef199
1 parent 442ae07
commit b7ef199
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 136 deletions.
diff --git a/GeneratorInterface/Pythia8Interface/BuildFile.xml b/GeneratorInterface/Pythia8Interface/BuildFile.xml
@@ -7,8 +7,6 @@
 <use name="boost"/>
 <use name="pythia8"/>
 <use name="evtgen"/>
-<use name="vincia"/>
-<use name="dire"/>
 <use name="hepmc"/>
 <use name="clhep"/>
 <export>

diff --git a/GeneratorInterface/Pythia8Interface/interface/BiasedTauDecayer.h b/GeneratorInterface/Pythia8Interface/interface/BiasedTauDecayer.h
@@ -8,11 +8,10 @@
 //
 class BiasedTauDecayer : public Pythia8::DecayHandler {
 public:
-  BiasedTauDecayer(Pythia8::Info* infoPtr,
+  BiasedTauDecayer(const Pythia8::Info* infoPtr,
                    Pythia8::Settings* settingsPtr,
                    Pythia8::ParticleData* particleDataPtr,
-                   Pythia8::Rndm* rndmPtr,
-                   Pythia8::Couplings* couplingsPtr);
+                   Pythia8::Rndm* rndmPtr);
 
   bool decay(std::vector<int>& idProd,
              std::vector<double>& mProd,

diff --git a/GeneratorInterface/Pythia8Interface/interface/MultiUserHook.h b/GeneratorInterface/Pythia8Interface/interface/MultiUserHook.h
@@ -15,17 +15,17 @@ class MultiUserHook : public Pythia8::UserHooks {
   bool initAfterBeams() override {
     bool test = true;
     for (Pythia8::UserHooks *hook : hooks_) {
-      hook->initPtr(infoPtr,
-                    settingsPtr,
-                    particleDataPtr,
-                    rndmPtr,
-                    beamAPtr,
-                    beamBPtr,
-                    beamPomAPtr,
-                    beamPomBPtr,
-                    coupSMPtr,
-                    partonSystemsPtr,
-                    sigmaTotPtr);
+//      hook->initPtr(infoPtr,
+//                    settingsPtr,
+//                    particleDataPtr,
+//                    rndmPtr,
+//                    beamAPtr,
+//                    beamBPtr,
+//                    beamPomAPtr,
+//                    beamPomBPtr,
+//                    coupSMPtr,
+//                    partonSystemsPtr,
+//                    sigmaTotPtr);
       test &= hook->initAfterBeams();
     }
 

diff --git a/GeneratorInterface/Pythia8Interface/interface/Py8InterfaceBase.h b/GeneratorInterface/Pythia8Interface/interface/Py8InterfaceBase.h
@@ -12,9 +12,11 @@
 
 #include <Pythia8/Pythia.h>
 #include <Pythia8Plugins/HepMC2.h>
-#include <Dire/Dire.h>
+//#include <Dire/Dire.h>
 
-class EvtGenDecays;
+namespace Pythia8 {
+  class EvtGenDecays;
+}
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -56,7 +58,7 @@ namespace gen {
     // EvtGen plugin
     //
     bool useEvtGen;
-    std::shared_ptr<EvtGenDecays> evtgenDecays;
+    std::shared_ptr<Pythia8::EvtGenDecays> evtgenDecays;
     std::string evtgenDecFile;
     std::string evtgenPdlFile;
     std::vector<std::string> evtgenUserFiles;

diff --git a/GeneratorInterface/Pythia8Interface/plugins/JetMatchingHook.cc b/GeneratorInterface/Pythia8Interface/plugins/JetMatchingHook.cc
@@ -22,16 +22,16 @@ extern struct {
 using namespace gen;
 using namespace Pythia8;
 
-JetMatchingHook::JetMatchingHook(const edm::ParameterSet& ps, Info* info)
+JetMatchingHook::JetMatchingHook(const edm::ParameterSet& ps, const Info* info)
     : UserHooks(),
       fRunBlock(nullptr),
       fEventBlock(nullptr),
       fEventNumber(0),
-      fInfoPtr(info),
+//      fInfoPtr(info),
       fJetMatching(nullptr),
       fJetInputFill(nullptr),
       fIsInitialized(false) {
-  assert(fInfoPtr);
+//  assert(fInfoPtr);
 
   std::string scheme = ps.getParameter<std::string>("scheme");
 

diff --git a/GeneratorInterface/Pythia8Interface/plugins/JetMatchingHook.h b/GeneratorInterface/Pythia8Interface/plugins/JetMatchingHook.h
@@ -17,7 +17,7 @@ class Py8toJetInput;
 
 class JetMatchingHook : public Pythia8::UserHooks {
 public:
-  JetMatchingHook(const edm::ParameterSet&, Pythia8::Info*);
+  JetMatchingHook(const edm::ParameterSet&, const Pythia8::Info*);
   ~JetMatchingHook() override;
 
   //