Merge pull request #9494 from mkirsano/remove_hepmca2

Use pythia8 internal code to append event in residualDecays
cms-sw · Jun 8, 2015 · 1a39f50 · 1a39f50
2 parents 9a9f988 + 24bb966
commit 1a39f50
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 238 deletions.
diff --git a/GeneratorInterface/Pythia8Interface/plugins/HepMCA2.h b/GeneratorInterface/Pythia8Interface/plugins/HepMCA2.h
diff --git a/GeneratorInterface/Pythia8Interface/plugins/Pythia8Hadronizer.cc b/GeneratorInterface/Pythia8Interface/plugins/Pythia8Hadronizer.cc
@@ -10,7 +10,6 @@
 
 #include "Pythia8/Pythia.h"
 #include "Pythia8Plugins/HepMC2.h"
-#include "GeneratorInterface/Pythia8Interface/plugins/HepMCA2.h"
 
 #include "GeneratorInterface/Pythia8Interface/interface/Py8InterfaceBase.h"
 
@@ -579,9 +578,8 @@ bool Pythia8Hadronizer::residualDecay()
 
   if(NPartsAfterDecays == NPartsBeforeDecays) return true;
 
-  HepMC::Pythia8ToHepMCA toHepMCA;
   bool result = true;
- 
+
   for ( int ipart=NPartsAfterDecays; ipart>NPartsBeforeDecays; ipart-- )
   {
 
@@ -609,7 +607,7 @@ bool Pythia8Hadronizer::residualDecay()
 
       part->set_status(2);
 
-      result = toHepMCA.append_event( fDecayer->event, event().get(), part);
+      result = toHepMC.fill_next_event( *(fDecayer.get()), event().get(), -1, true, part);
 
     }
   }

diff --git a/GeneratorInterface/Pythia8Interface/src/Py8GunBase.cc b/GeneratorInterface/Pythia8Interface/src/Py8GunBase.cc
@@ -1,8 +1,6 @@
 #include "GeneratorInterface/Pythia8Interface/interface/Py8GunBase.h"
 #include "FWCore/Concurrency/interface/SharedResourceNames.h"
 
-#include "GeneratorInterface/Pythia8Interface/plugins/HepMCA2.h"
-
 using namespace Pythia8;
 
 const std::vector<std::string> gen::Py8GunBase::p8SharedResources = { edm::SharedResourceNames::kPythia8 };
@@ -72,7 +70,6 @@ bool Py8GunBase::residualDecay()
 
   if(NPartsAfterDecays == NPartsBeforeDecays) return true;
 
-  HepMC::Pythia8ToHepMCA toHepMCA;
   bool result = true;
 
   for ( int ipart=NPartsAfterDecays; ipart>NPartsBeforeDecays; ipart-- )
@@ -102,7 +99,7 @@ bool Py8GunBase::residualDecay()
 
       part->set_status(2);
 
-      result = toHepMCA.append_event( fDecayer->event, event().get(), part);
+      result = toHepMC.fill_next_event( *(fDecayer.get()), event().get(), -1, true, part);
 
     }
   }