Merge pull request #44603 from mseidel42/Rivet4

Updates for Rivet 4
cms-sw · Jul 2, 2024 · d191977 · d191977
2 parents 0bc07c8 + b07831a
commit d191977
Show file tree

Hide file tree

Showing 36 changed files with 347 additions and 2,294 deletions.
diff --git a/GeneratorInterface/Core/interface/GeneratorFilter.h b/GeneratorInterface/Core/interface/GeneratorFilter.h
@@ -33,6 +33,7 @@
 
 //#include "GeneratorInterface/LHEInterface/interface/LHEEvent.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMC3Product.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenRunInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoHeader.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoProduct.h"
@@ -125,8 +126,8 @@ namespace edm {
       produces<edm::HepMCProduct>("unsmeared");
       produces<GenEventInfoProduct>();
     } else if (ivhepmc == 3) {
-      //produces<edm::HepMC3Product>("unsmeared");
-      //produces<GenEventInfoProduct3>();
+      produces<edm::HepMC3Product>("unsmeared");
+      produces<GenEventInfoProduct3>();
     }
     produces<GenLumiInfoHeader, edm::Transition::BeginLuminosityBlock>();
     produces<GenLumiInfoProduct, edm::Transition::EndLuminosityBlock>();
@@ -249,11 +250,11 @@ namespace edm {
         genEventInfo3.reset(new GenEventInfoProduct3(event3.get()));
       }
 
-      //ev.put(std::move(genEventInfo3));
+      ev.put(std::move(genEventInfo3));
 
-      //std::unique_ptr<HepMCProduct3> bare_product(new HepMCProduct3());
-      //bare_product->addHepMCData(event3.release());
-      //ev.put(std::move(bare_product), "unsmeared");
+      std::unique_ptr<HepMC3Product> bare_product(new HepMC3Product());
+      bare_product->addHepMCData(event3.release());
+      ev.put(std::move(bare_product), "unsmeared");
     }
 
     nEventsInLumiBlock_++;

diff --git a/GeneratorInterface/Pythia8Interface/interface/Py8HMC3InterfaceBase.h b/GeneratorInterface/Pythia8Interface/interface/Py8HMC3InterfaceBase.h
@@ -62,7 +62,7 @@ namespace gen {
     std::string slhafile_;
 
   private:
-    P8RndmEnginePtr p8RndmEngine_;
+    std::shared_ptr<P8RndmEngine> p8RndmEngine_;
   };
 }  // namespace gen
 #endif
diff --git a/GeneratorInterface/Pythia8Interface/src/Py8HMC3InterfaceBase.cc b/GeneratorInterface/Pythia8Interface/src/Py8HMC3InterfaceBase.cc
@@ -20,6 +20,7 @@ namespace gen {
     pythiaHepMCVerbosity = ps.getUntrackedParameter<bool>("pythiaHepMCVerbosity", false);
     pythiaHepMCVerbosityParticles = ps.getUntrackedParameter<bool>("pythiaHepMCVerbosityParticles", false);
     maxEventsToPrint = ps.getUntrackedParameter<int>("maxEventsToPrint", 0);
+    p8RndmEngine_ = std::make_shared<P8RndmEngine>();
 
     //if (pythiaHepMCVerbosityParticles)
     //  ascii_io = new HepMC::IO_AsciiParticles("cout", std::ios::out);

diff --git a/GeneratorInterface/RivetInterface/BuildFile.xml b/GeneratorInterface/RivetInterface/BuildFile.xml
@@ -5,4 +5,6 @@
 <use name="boost"/>
 <use name="gsl"/>
 <use name="root"/>
+<use name="hepmc3"/>
 <flags RIVET_PLUGIN="1"/>
+<flags CXXFLAGS="-Wno-error=missing-braces -Wno-missing-braces -Wno-non-virtual-dtor"/>
diff --git a/GeneratorInterface/RivetInterface/data/CMS_2013_I1224539_DIJET.info b/GeneratorInterface/RivetInterface/data/CMS_2013_I1224539_DIJET.info
diff --git a/GeneratorInterface/RivetInterface/data/CMS_2013_I1224539_DIJET.plot b/GeneratorInterface/RivetInterface/data/CMS_2013_I1224539_DIJET.plot