Merge pull request #37612 from iarspider/drop-herwig6-jimmy

Drop Herwig6Interface, MCatNLOInterface, PomwigInterface
cms-sw · Apr 21, 2022 · 1a94a71 · 1a94a71
2 parents fdf7242 + 41bf902
commit 1a94a71
Show file tree

Hide file tree

Showing 83 changed files with 1 addition and 40,551 deletions.
diff --git a/FWCore/Concurrency/interface/SharedResourceNames.h b/FWCore/Concurrency/interface/SharedResourceNames.h
@@ -28,7 +28,6 @@ namespace edm {
     static const std::string kPhotos;
     static const std::string kTauola;
     static const std::string kEvtGen;
-    static const std::string kHerwig6;
   };
 
   //ES modules can not share resources with ED modules

diff --git a/FWCore/Concurrency/src/SharedResourceNames.cc b/FWCore/Concurrency/src/SharedResourceNames.cc
@@ -10,7 +10,6 @@ const std::string edm::SharedResourceNames::kPythia8 = "Pythia8";
 const std::string edm::SharedResourceNames::kPhotos = "Photos";
 const std::string edm::SharedResourceNames::kTauola = "Tauola";
 const std::string edm::SharedResourceNames::kEvtGen = "EvtGen";
-const std::string edm::SharedResourceNames::kHerwig6 = "Herwig6";
 
 const std::string edm::ESSharedResourceNames::kDDGeometry = "es_DDGeometry";
 const std::string edm::ESSharedResourceNames::kDD4hep = "es_DD4hep";

diff --git a/GeneratorInterface/Herwig6Interface/BuildFile.xml b/GeneratorInterface/Herwig6Interface/BuildFile.xml
diff --git a/GeneratorInterface/Herwig6Interface/interface/Herwig6Instance.h b/GeneratorInterface/Herwig6Interface/interface/Herwig6Instance.h