Merge pull request #43786 from mseidel42/P8RndmEnginePtr

Adaptions for Pythia 8.311

Author: cmsbuild

FastSimulation/ParticleDecay/interface/PythiaDecays.h

@@ -12,7 +12,8 @@ class RawParticle;
 
 namespace gen {
   class P8RndmEngine;
-}
+  typedef std::shared_ptr<P8RndmEngine> P8RndmEnginePtr;
+}  // namespace gen
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -34,6 +35,6 @@ class PythiaDecays {
 private:
   DaughterParticleList theList;
   std::unique_ptr<Pythia8::Pythia> decayer;
-  std::unique_ptr<gen::P8RndmEngine> p8RndmEngine;
+  gen::P8RndmEnginePtr p8RndmEngine;
 };
 #endif

FastSimulation/ParticleDecay/src/PythiaDecays.cc

@@ -12,8 +12,8 @@
 PythiaDecays::PythiaDecays() {
   // inspired by method Pythia8Hadronizer::residualDecay() in GeneratorInterface/Pythia8Interface/src/Py8GunBase.cc
   decayer = std::make_unique<Pythia8::Pythia>();
-  p8RndmEngine = std::make_unique<gen::P8RndmEngine>();
-  decayer->setRndmEnginePtr(p8RndmEngine.get());
+  p8RndmEngine = std::make_shared<gen::P8RndmEngine>();
+  decayer->setRndmEnginePtr(p8RndmEngine);
   decayer->settings.flag("ProcessLevel:all", false);
   decayer->settings.flag("PartonLevel:FSRinResonances", false);
   decayer->settings.flag("ProcessLevel:resonanceDecays", false);

FastSimulation/SimplifiedGeometryPropagator/interface/Decayer.h

@@ -14,7 +14,8 @@
 
 namespace gen {
   class P8RndmEngine;
-}
+  typedef std::shared_ptr<P8RndmEngine> P8RndmEnginePtr;
+}  // namespace gen
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -50,8 +51,8 @@ namespace fastsim {
                CLHEP::HepRandomEngine& engine) const;
 
   private:
-    std::unique_ptr<Pythia8::Pythia> pythia_;                //!< Instance of pythia
-    std::unique_ptr<gen::P8RndmEngine> pythiaRandomEngine_;  //!< Instance of pythia Random Engine
+    std::unique_ptr<Pythia8::Pythia> pythia_;  //!< Instance of pythia
+    gen::P8RndmEnginePtr pythiaRandomEngine_;  //!< Instance of pythia Random Engine
   };
 }  // namespace fastsim
 #endif

FastSimulation/SimplifiedGeometryPropagator/src/Decayer.cc

@@ -10,7 +10,7 @@
 fastsim::Decayer::~Decayer() { ; }
 
 fastsim::Decayer::Decayer() : pythia_(new Pythia8::Pythia()), pythiaRandomEngine_(new gen::P8RndmEngine()) {
-  pythia_->setRndmEnginePtr(pythiaRandomEngine_.get());
+  pythia_->setRndmEnginePtr(pythiaRandomEngine_);
   pythia_->settings.flag("ProcessLevel:all", false);
   pythia_->settings.flag("PartonLevel:FSRinResonances", false);
   pythia_->settings.flag("ProcessLevel:resonanceDecays", false);

GeneratorInterface/Pythia8Interface/interface/P8RndmEngine.h

@@ -38,5 +38,6 @@ namespace gen {
 
     CLHEP::HepRandomEngine* randomEngine_;
   };
+  typedef std::shared_ptr<P8RndmEngine> P8RndmEnginePtr;
 }  // namespace gen
 #endif

GeneratorInterface/Pythia8Interface/interface/Py8HMC3InterfaceBase.h

@@ -37,8 +37,8 @@ namespace gen {
     virtual void statistics();
     virtual const char* classname() const = 0;
 
-    void p8SetRandomEngine(CLHEP::HepRandomEngine* v) { p8RndmEngine_.setRandomEngine(v); }
-    P8RndmEngine& randomEngine() { return p8RndmEngine_; }
+    void p8SetRandomEngine(CLHEP::HepRandomEngine* v) { p8RndmEngine_->setRandomEngine(v); }
+    P8RndmEngine& randomEngine() { return *p8RndmEngine_; }
 
   protected:
     std::unique_ptr<Pythia8::Pythia> fMasterGen;
@@ -62,7 +62,7 @@ namespace gen {
     std::string slhafile_;
 
   private:
-    P8RndmEngine p8RndmEngine_;
+    P8RndmEnginePtr p8RndmEngine_;
   };
 }  // namespace gen
 #endif

GeneratorInterface/Pythia8Interface/interface/Py8InterfaceBase.h

@@ -40,8 +40,8 @@ namespace gen {
     virtual void statistics();
     virtual const char* classname() const = 0;
 
-    void p8SetRandomEngine(CLHEP::HepRandomEngine* v) { p8RndmEngine_.setRandomEngine(v); }
-    P8RndmEngine& randomEngine() { return p8RndmEngine_; }
+    void p8SetRandomEngine(CLHEP::HepRandomEngine* v) { p8RndmEngine_->setRandomEngine(v); }
+    P8RndmEngine& randomEngine() { return *p8RndmEngine_; }
 
   protected:
     std::unique_ptr<Pythia8::Pythia> fMasterGen;
@@ -67,7 +67,7 @@ namespace gen {
     std::string slhafile_;
 
   private:
-    P8RndmEngine p8RndmEngine_;
+    std::shared_ptr<P8RndmEngine> p8RndmEngine_;
   };
 }  // namespace gen
 #endif

GeneratorInterface/Pythia8Interface/plugins/PowhegHooksBB4L.h

@@ -184,9 +184,9 @@ namespace Pythia8 {
           iRes = e[iRes].mother1();
         }
         if (iRes == 0) {
-          infoPtr->errorMsg(
-              "Warning in PowhegHooksBB4L::doVetoFSREmission: emission in resonance not from the top quark or from the "
-              "W boson, not vetoing");
+          loggerPtr->errorMsg("PowhegHooksBB4L::doVetoFSREmission",
+                              "Emission in resonance not from the top quark or from the "
+                              "W boson, not vetoing");
           return doVetoFSR(false, 0);
         }
         int iResId = e[iRes].id();
@@ -241,7 +241,7 @@ namespace Pythia8 {
                  << scale << endl;
           return doVetoFSR(scale > wmresscale, scale);
         } else {
-          infoPtr->errorMsg("Error in PowhegHooksBB4L::doVetoFSREmission: unimplemented case");
+          loggerPtr->errorMsg("PowhegHooksBB4L::doVetoFSREmissio", "Unimplemented case");
           exit(-1);
         }
       }

GeneratorInterface/Pythia8Interface/plugins/SuepDecay.cc

@@ -9,7 +9,7 @@ bool SuepDecay::initAfterBeams() {
   mDark_ = particleDataPtr->m0(idDark_);
   bool medDecay = particleDataPtr->mayDecay(idMediator_);
   if (!medDecay) {
-    infoPtr->errorMsg("Error in SuepDecay::initAfterBeams: mediator decay should be enabled");
+    loggerPtr->errorMsg("SuepDecay::initAfterBeams", "mediator decay should be enabled");
     return false;
   }
 

GeneratorInterface/Pythia8Interface/src/Py8HMC3InterfaceBase.cc

@@ -109,8 +109,8 @@ namespace gen {
     fMasterGen->settings.addFlag("POWHEG:bb4l:FSREmission:pTpythiaVeto", false);
     fMasterGen->settings.addParm("POWHEG:bb4l:pTminVeto", 10.0, true, true, 0.0, 10.);
 
-    fMasterGen->setRndmEnginePtr(&p8RndmEngine_);
-    fDecayer->setRndmEnginePtr(&p8RndmEngine_);
+    fMasterGen->setRndmEnginePtr(p8RndmEngine_);
+    fDecayer->setRndmEnginePtr(p8RndmEngine_);
 
     fMasterGen->readString("Next:numberShowEvent = 0");
     fDecayer->readString("Next:numberShowEvent = 0");