Merge pull request #30866 from guitargeek/deps_GeneratorInterface

Clean BuildFiles in GeneratorInterface
cms-sw · Aug 5, 2020 · 503f805 · 503f805
2 parents 78d9777 + 0dca8ac
commit 503f805
Show file tree

Hide file tree

Showing 33 changed files with 11 additions and 74 deletions.
diff --git a/GeneratorInterface/AMPTInterface/test/BuildFile.xml b/GeneratorInterface/AMPTInterface/test/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="FWCore/Framework"/>
 <use name="SimDataFormats/Vertex"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="SimDataFormats/HiGenData"/>
 <use name="SimGeneral/HepPDTRecord"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="FWCore/ServiceRegistry"/>

diff --git a/GeneratorInterface/BeamHaloGenerator/BuildFile.xml b/GeneratorInterface/BeamHaloGenerator/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Core"/>
 <use name="clhep"/>
 <use name="root"/>
 <use name="f77compiler"/>

diff --git a/GeneratorInterface/CascadeInterface/BuildFile.xml b/GeneratorInterface/CascadeInterface/BuildFile.xml
@@ -1,8 +1,4 @@
 <use name="boost"/>
-<use name="FWCore/Concurrency"/>
-<use name="FWCore/Framework"/>
-<use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Core"/>
 <use name="clhep"/>
 <use name="pythia6"/>
 <use name="cascade"/>

diff --git a/GeneratorInterface/CascadeInterface/plugins/BuildFile.xml b/GeneratorInterface/CascadeInterface/plugins/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="GeneratorInterface/CascadeInterface"/>
 <architecture name="slc5_amd64_gcc47">
   <use name="pydata"/>
 </architecture>
@@ -8,6 +7,8 @@
 <library file="Cascade2GeneratorFilter.cc,Cascade2Hadronizer.cc" name="GeneratorInterfaceCascadeInterfacePlugin">
   <use name="GeneratorInterface/PartonShowerVeto"/>
   <use name="GeneratorInterface/ExternalDecays"/>
+  <use name="GeneratorInterface/CascadeInterface"/>
+  <use name="GeneratorInterface/Pythia6Interface"/>
   <use name="heppdt"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/GeneratorInterface/Core/plugins/BuildFile.xml b/GeneratorInterface/Core/plugins/BuildFile.xml
@@ -3,8 +3,8 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Core"/>
 <use name="FWCore/SharedMemory"/>
+<use name="clhep"/>
 <library name="GeneratorInterfaceCore_plugins" file="*.cc">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/GeneratorInterface/CosmicMuonGenerator/BuildFile.xml b/GeneratorInterface/CosmicMuonGenerator/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Core"/>
 <use name="clhep"/>
 <use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/GeneratorInterface/ExhumeInterface/BuildFile.xml b/GeneratorInterface/ExhumeInterface/BuildFile.xml
@@ -1,8 +1,6 @@
-<use name="FWCore/Framework"/>
 <use name="FWCore/Concurrency"/>
 <use name="GeneratorInterface/Core"/>
 <use name="GeneratorInterface/Pythia6Interface"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="boost"/>
 <use name="clhep"/>
 <use name="f77compiler"/>

diff --git a/GeneratorInterface/ExhumeInterface/test/BuildFile.xml b/GeneratorInterface/ExhumeInterface/test/BuildFile.xml
@@ -1,7 +1,5 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="DataFormats/Math"/>
-<use name="DataFormats/Candidate"/>
 <flags EDM_PLUGIN="1"/>
 <library file="ExhumeAnalyzer.cc" name="ExhumeAnalyzer">
   <use name="CommonTools/UtilAlgos"/>

diff --git a/GeneratorInterface/ExternalDecays/BuildFile.xml b/GeneratorInterface/ExternalDecays/BuildFile.xml
@@ -1,10 +1,7 @@
 <use name="FWCore/Concurrency"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="heppdt"/>
-<use name="SimGeneral/HepPDTRecord"/>
 <use name="clhep"/>
 <use name="hepmc"/>
 <use name="GeneratorInterface/Core"/>

diff --git a/GeneratorInterface/ExternalDecays/test/BuildFile.xml b/GeneratorInterface/ExternalDecays/test/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="FWCore/Utilities"/>
 <use name="boost"/>
 <use name="hepmc"/>
 <flags EDM_PLUGIN="1"/>

diff --git a/GeneratorInterface/Herwig6Interface/BuildFile.xml b/GeneratorInterface/Herwig6Interface/BuildFile.xml
@@ -1,5 +1,3 @@
-<use name="FWCore/Concurrency"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="GeneratorInterface/Core"/>
 <use name="tauola"/>
 <use name="boost"/>

diff --git a/GeneratorInterface/Herwig6Interface/plugins/BuildFile.xml b/GeneratorInterface/Herwig6Interface/plugins/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/Utilities"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="boost"/>
 <use name="heppdt"/>

diff --git a/GeneratorInterface/Herwig7Interface/BuildFile.xml b/GeneratorInterface/Herwig7Interface/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="GeneratorInterface/Core"/>
 <use name="boost"/>
 <use name="hepmc"/>

diff --git a/GeneratorInterface/HiGenCommon/BuildFile.xml b/GeneratorInterface/HiGenCommon/BuildFile.xml
@@ -1,7 +1,5 @@
-<use name="GeneratorInterface/Core"/>
-<use name="SimDataFormats/GeneratorProducts"/>
-<use name="SimGeneral/HepPDTRecord"/>
 <use name="FWCore/ParameterSet"/>
+<use name="hepmc"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/GeneratorInterface/HiGenCommon/plugins/BuildFile.xml b/GeneratorInterface/HiGenCommon/plugins/BuildFile.xml
@@ -1,11 +1,12 @@
-<use name="GeneratorInterface/HiGenCommon"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
+<use name="SimDataFormats/GeneratorProducts"/>
 <use name="SimGeneral/HepPDTRecord"/>
+<use name="hepmc"/>
 <use name="heppdt"/>
 <use name="clhep"/>
+<use name="root"/>
 <library file="*.cc" name="GeneratorInterfaceHiGenCommonPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/GeneratorInterface/Hydjet2Interface/BuildFile.xml b/GeneratorInterface/Hydjet2Interface/BuildFile.xml
@@ -3,20 +3,14 @@
 <use name="FWCore/Framework"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="GeneratorInterface/Pythia6Interface"/>
-<use name="GeneratorInterface/PyquenInterface"/>
 <use name="GeneratorInterface/ExternalDecays"/>
-<use name="GeneratorInterface/HiGenCommon"/>
 <use name="FWCore/Concurrency"/>
 <use name="clhep"/>
 <use name="f77compiler"/>
-<use name="DataFormats/Math"/>
-<use name="DataFormats/Common"/>
-<use name="DataFormats/Provenance"/>
-<use name="FWCore/Common"/>
-<use name="FWCore/FWLite"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="CommonTools/UtilAlgos"/>
+<use name="pyquen"/>
 <use name="root"/>
 <use name="rootmath"/>
 <use name="rootcore"/>

diff --git a/GeneratorInterface/Hydjet2Interface/test/BuildFile.xml b/GeneratorInterface/Hydjet2Interface/test/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="boost"/>
 <use name="root"/>
 <use name="heppdt"/>
-<use name="GeneratorInterface/Hydjet2Interface"/>
 <use name="FWCore/Framework"/>
 <use name="SimDataFormats/Vertex"/>
 <use name="SimDataFormats/GeneratorProducts"/>

diff --git a/GeneratorInterface/HydjetInterface/test/BuildFile.xml b/GeneratorInterface/HydjetInterface/test/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="boost"/>
 <use name="root"/>
 <use name="heppdt"/>
-<use name="GeneratorInterface/HydjetInterface"/>
 <use name="FWCore/Framework"/>
 <use name="SimDataFormats/Vertex"/>
 <use name="SimDataFormats/GeneratorProducts"/>

diff --git a/GeneratorInterface/LHEInterface/BuildFile.xml b/GeneratorInterface/LHEInterface/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/Utilities"/>
 <use name="Utilities/Xerces"/>
 <use name="SimDataFormats/GeneratorProducts"/>

diff --git a/GeneratorInterface/LHEInterface/plugins/BuildFile.xml b/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="GeneratorInterface/LHEInterface"/>
-<use name="GeneratorInterface/Core"/>
 <use name="stdcxx-fs"/>
 <library name="GeneratorInterfaceLHEProducer" file="LHEFilter.cc LHE2HepMCConverter.cc ExternalLHEProducer.cc ExternalLHEAsciiDumper.cc">
   <use name="FWCore/Framework"/>

diff --git a/GeneratorInterface/MCatNLOInterface/plugins/BuildFile.xml b/GeneratorInterface/MCatNLOInterface/plugins/BuildFile.xml
@@ -1,7 +1,5 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/Utilities"/>
 <use name="GeneratorInterface/Herwig6Interface"/>
 <use name="boost"/>
 <library name="GeneratorInterfaceMCatNLOSource" file="MCatNLOSource.cc mcatnlo_hwursc.f mcatnlo_upevnt.f mcatnlo_upinit.f">

diff --git a/GeneratorInterface/MCatNLOInterface/test/BuildFile.xml b/GeneratorInterface/MCatNLOInterface/test/BuildFile.xml
@@ -1,12 +1,10 @@
 <use name="boost"/>
 <use name="root"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="CLHEP"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Core"/>
 <flags EDM_PLUGIN="1"/>
 <library file="ZeeAnalyzer.cc" name="ZeeAnalyzer">
 </library>
diff --git a/GeneratorInterface/PartonShowerVeto/BuildFile.xml b/GeneratorInterface/PartonShowerVeto/BuildFile.xml
@@ -1,11 +1,10 @@
-<use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Pythia6Interface"/>
 <use name="GeneratorInterface/AlpgenInterface"/>
 <use name="GeneratorInterface/LHEInterface"/>
 <use name="fastjet"/>
 <use name="pythia8"/>
+<use name="pythia6"/>
 <use name="f77compiler"/>
 <export>
   <lib name="1"/>

diff --git a/GeneratorInterface/PomwigInterface/BuildFile.xml b/GeneratorInterface/PomwigInterface/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="FWCore/Framework"/>
 <use name="FWCore/Concurrency"/>
 <use name="GeneratorInterface/Core"/>
 <use name="GeneratorInterface/Herwig6Interface"/>

diff --git a/GeneratorInterface/PomwigInterface/plugins/BuildFile.xml b/GeneratorInterface/PomwigInterface/plugins/BuildFile.xml
@@ -1,7 +1,3 @@
-<use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/Utilities"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="boost"/>
 <use name="heppdt"/>
 <use name="clhep"/>

diff --git a/GeneratorInterface/PomwigInterface/test/BuildFile.xml b/GeneratorInterface/PomwigInterface/test/BuildFile.xml
@@ -1,16 +1,13 @@
 <use name="boost"/>
 <use name="root"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="CLHEP"/>
-<use name="GeneratorInterface/Core"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/HepMCCandidate"/>
 <use name="DataFormats/JetReco"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="CommonTools/CandUtils"/>
 <flags EDM_PLUGIN="1"/>
 <library name="GeneratorInterfacePomwigInterface_test" file="*.cc">
 </library>
diff --git a/GeneratorInterface/PyquenInterface/test/BuildFile.xml b/GeneratorInterface/PyquenInterface/test/BuildFile.xml
@@ -1,10 +1,9 @@
 <use name="boost"/>
 <use name="root"/>
-<use name="GeneratorInterface/PyquenInterface"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="SimDataFormats/HiGenData"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
 <flags EDM_PLUGIN="1"/>
 <library file="PyquenAnalyzer.cc" name="PyquenAnalyzer">
 </library>
diff --git a/GeneratorInterface/Pythia6Interface/BuildFile.xml b/GeneratorInterface/Pythia6Interface/BuildFile.xml
@@ -1,7 +1,4 @@
 <use name="boost"/>
-<use name="FWCore/Framework"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="GeneratorInterface/Core"/>
 <use name="clhep"/>
 <use name="pythia6"/>

diff --git a/GeneratorInterface/Pythia6Interface/test/BuildFile.xml b/GeneratorInterface/Pythia6Interface/test/BuildFile.xml
@@ -1,8 +1,6 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
 <use name="root"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Core"/>
 <use name="CommonTools/UtilAlgos"/>
 <library file="HZZ4muAnalyzer.cc" name="HZZ4muExampleAnalyzer">
   <flags EDM_PLUGIN="1"/>

diff --git a/GeneratorInterface/Pythia8Interface/test/BuildFile.xml b/GeneratorInterface/Pythia8Interface/test/BuildFile.xml
@@ -1,16 +1,9 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
+<use name="fastjet"/>
 <use name="root"/>
 <use name="SimDataFormats/GeneratorProducts"/> 
-<use name="GeneratorInterface/Core"/>
 <use name="CommonTools/UtilAlgos"/>
 
-<!--
-<library file="analyserhepmc/LeptonAnalyserHepMC.cc" name="AnalyserHepMC">
-  <flags EDM_PLUGIN="1"/>
-</library>
--->
-
 <library file="ZJetsAnalyzer.cc,analyserhepmc/LeptonAnalyserHepMC.cc,analyserhepmc/JetInputHepMC.cc" name="ZJetsTestAnalyzer">
   <flags EDM_PLUGIN="1"/>
 </library>

diff --git a/GeneratorInterface/RivetInterface/BuildFile.xml b/GeneratorInterface/RivetInterface/BuildFile.xml
@@ -5,6 +5,4 @@
 <use name="boost"/>
 <use name="gsl"/>
 <use name="root"/>
-<use name="GeneratorInterface/Core"/>
-<use name="GeneratorInterface/Pythia6Interface"/>
 <flags RIVET_PLUGIN="1"/>
diff --git a/GeneratorInterface/RivetInterface/plugins/BuildFile.xml b/GeneratorInterface/RivetInterface/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="GeneratorInterface/Core"/>
 <use name="DataFormats/Common"/>
 <use name="rivet"/>
 <use name="yoda"/>
@@ -10,7 +9,6 @@
 <use name="DQMServices/Core"/>
 <use name="SimGeneral/HepPDTRecord"/>
 <use name="DataFormats/HepMCCandidate"/>
-<use name="DataFormats/JetReco"/>
 <use name="DataFormats/METReco"/>
 <use name="DataFormats/PatCandidates"/>
 <library file="*.cc" name="GeneratorInterfaceRivetInterface_plugins">

diff --git a/GeneratorInterface/SherpaInterface/BuildFile.xml b/GeneratorInterface/SherpaInterface/BuildFile.xml
@@ -1,12 +1,8 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="GeneratorInterface/Core"/>
 <use name="GeneratorInterface/ExternalDecays"/>
-<use name="GeneratorInterface/Pythia6Interface"/>
 <use name="clhep"/>
 <use name="sherpa"/>
-<use name="FWCore/Services"/>
 <use name="zlib"/>
 <flags EDM_PLUGIN="1"/>