From b1e95f862b1add1cc1a9ff4fee50fefeef40f374 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Wed, 22 Jan 2020 19:40:49 +0100
Subject: [PATCH 1/3] removed unneeded build dependencies in PhysicsTools

---
 PhysicsTools/FWLite/BuildFile.xml              | 1 -
 PhysicsTools/HepMCCandAlgos/BuildFile.xml      | 1 -
 PhysicsTools/JetCharge/BuildFile.xml           | 1 -
 PhysicsTools/JetMCAlgos/BuildFile.xml          | 3 ---
 PhysicsTools/JetMCUtils/BuildFile.xml          | 1 -
 PhysicsTools/MXNet/BuildFile.xml               | 2 --
 PhysicsTools/ONNXRuntime/BuildFile.xml         | 2 --
 PhysicsTools/ParallelAnalysis/BuildFile.xml    | 1 -
 PhysicsTools/PatAlgos/BuildFile.xml            | 9 ---------
 PhysicsTools/PatAlgos/plugins/BuildFile.xml    | 1 +
 PhysicsTools/PatExamples/BuildFile.xml         | 4 ----
 PhysicsTools/PatExamples/plugins/BuildFile.xml | 1 +
 PhysicsTools/RecoUtils/BuildFile.xml           | 2 --
 PhysicsTools/RooStatsCms/BuildFile.xml         | 3 ---
 PhysicsTools/SelectorUtils/BuildFile.xml       | 4 ----
 PhysicsTools/TagAndProbe/BuildFile.xml         | 5 -----
 PhysicsTools/TensorFlow/BuildFile.xml          | 1 -
 PhysicsTools/UtilAlgos/BuildFile.xml           | 1 -
 18 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/PhysicsTools/FWLite/BuildFile.xml b/PhysicsTools/FWLite/BuildFile.xml
index 68b5d6baade9c..f9bae23790de4 100644
--- a/PhysicsTools/FWLite/BuildFile.xml
+++ b/PhysicsTools/FWLite/BuildFile.xml
@@ -3,7 +3,6 @@
 <use   name="roothistmatrix"/>
 <use   name="CommonTools/Utils"/>
 <use   name="DataFormats/FWLite"/>
-<use   name="DataFormats/MuonReco"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/PhysicsTools/HepMCCandAlgos/BuildFile.xml b/PhysicsTools/HepMCCandAlgos/BuildFile.xml
index 18aa6ab45a591..8e534383e719d 100644
--- a/PhysicsTools/HepMCCandAlgos/BuildFile.xml
+++ b/PhysicsTools/HepMCCandAlgos/BuildFile.xml
@@ -2,7 +2,6 @@
 <use   name="DataFormats/Candidate"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/HepMCCandidate"/>
-<use   name="FWCore/ServiceRegistry"/>
 <use   name="CommonTools/UtilAlgos"/>
 <use   name="hepmc"/>
 <use   name="eigen"/>
diff --git a/PhysicsTools/JetCharge/BuildFile.xml b/PhysicsTools/JetCharge/BuildFile.xml
index 3670413dec60e..3ec5d302853f0 100644
--- a/PhysicsTools/JetCharge/BuildFile.xml
+++ b/PhysicsTools/JetCharge/BuildFile.xml
@@ -1,4 +1,3 @@
-<use   name="DataFormats/Common"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="DataFormats/Candidate"/>
 <use   name="DataFormats/TrackReco"/>
diff --git a/PhysicsTools/JetMCAlgos/BuildFile.xml b/PhysicsTools/JetMCAlgos/BuildFile.xml
index d31c01f7884bb..1780c2c8e1c4f 100644
--- a/PhysicsTools/JetMCAlgos/BuildFile.xml
+++ b/PhysicsTools/JetMCAlgos/BuildFile.xml
@@ -1,6 +1,3 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/ParameterSet"/>
 <use name="PhysicsTools/JetMCUtils"/>
 <export>
    <lib name="1"/>
diff --git a/PhysicsTools/JetMCUtils/BuildFile.xml b/PhysicsTools/JetMCUtils/BuildFile.xml
index 90a2435260c42..5fb683c066f01 100644
--- a/PhysicsTools/JetMCUtils/BuildFile.xml
+++ b/PhysicsTools/JetMCUtils/BuildFile.xml
@@ -1,5 +1,4 @@
 <use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
 
 <export>
   <lib   name="1"/>
diff --git a/PhysicsTools/MXNet/BuildFile.xml b/PhysicsTools/MXNet/BuildFile.xml
index 6c7a5743d6a53..4bfaab8df5214 100644
--- a/PhysicsTools/MXNet/BuildFile.xml
+++ b/PhysicsTools/MXNet/BuildFile.xml
@@ -1,7 +1,5 @@
 <use name="mxnet-predict"/>
-<use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
-<use name="FWCore/MessageLogger"/>
 <export>
     <lib name="1" />
 </export>
diff --git a/PhysicsTools/ONNXRuntime/BuildFile.xml b/PhysicsTools/ONNXRuntime/BuildFile.xml
index cea28484dab3b..62b2ae1175a1d 100644
--- a/PhysicsTools/ONNXRuntime/BuildFile.xml
+++ b/PhysicsTools/ONNXRuntime/BuildFile.xml
@@ -1,7 +1,5 @@
 <use name="onnxruntime"/>
-<use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
-<use name="FWCore/MessageLogger"/>
 <export>
     <lib name="1" />
 </export>
diff --git a/PhysicsTools/ParallelAnalysis/BuildFile.xml b/PhysicsTools/ParallelAnalysis/BuildFile.xml
index 703e9d9d8333f..93d760e5d8d86 100644
--- a/PhysicsTools/ParallelAnalysis/BuildFile.xml
+++ b/PhysicsTools/ParallelAnalysis/BuildFile.xml
@@ -1,7 +1,6 @@
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="FWCore/TFWLiteSelector"/>
 <use   name="clhep"/>
 <use   name="rootgpad"/>
diff --git a/PhysicsTools/PatAlgos/BuildFile.xml b/PhysicsTools/PatAlgos/BuildFile.xml
index 1202dd3b1fa96..934b57806f59d 100644
--- a/PhysicsTools/PatAlgos/BuildFile.xml
+++ b/PhysicsTools/PatAlgos/BuildFile.xml
@@ -1,29 +1,20 @@
 <use   name="CommonTools/MVAUtils"/>
 <use   name="DataFormats/Candidate"/>
 <use   name="DataFormats/Common"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/EgammaReco"/>
 <use   name="DataFormats/JetReco"/>
 <use   name="DataFormats/Math"/>
-<use   name="DataFormats/METReco"/>
 <use   name="DataFormats/MuonReco"/>
 <use   name="DataFormats/PatCandidates"/>
-<use   name="DataFormats/TauReco"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="DataFormats/VertexReco"/>
 <use   name="JetMETCorrections/JetCorrector"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
 <use   name="FWCore/Utilities"/>
 <use   name="PhysicsTools/PatUtils"/>
-<use   name="PhysicsTools/Utilities"/>
 <use   name="PhysicsTools/IsolationAlgos"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="RecoEgamma/EgammaTools"/>
 <use   name="RecoTracker/DeDx"/>
 <use   name="CondFormats/HcalObjects"/>
-<use   name="CondFormats/EcalObjects"/>
 <use   name="clhep"/>
 <export>
   <lib   name="1"/>
diff --git a/PhysicsTools/PatAlgos/plugins/BuildFile.xml b/PhysicsTools/PatAlgos/plugins/BuildFile.xml
index e7d2c6386a13a..f750ab46d06a3 100644
--- a/PhysicsTools/PatAlgos/plugins/BuildFile.xml
+++ b/PhysicsTools/PatAlgos/plugins/BuildFile.xml
@@ -27,6 +27,7 @@
   <use   name="SimDataFormats/Track"/>
   <use   name="SimDataFormats/Vertex"/>
   <use   name="SimDataFormats/JetMatching"/>
+  <use   name="SimDataFormats/PileupSummaryInfo"/>
   <use   name="SimGeneral/HepPDTRecord"/>
   <use   name="RecoMET/METAlgorithms"/>
   <use   name="RecoEgamma/EgammaTools"/>
diff --git a/PhysicsTools/PatExamples/BuildFile.xml b/PhysicsTools/PatExamples/BuildFile.xml
index 8ef9fa8f2b8ec..dcc7475fb8fb0 100644
--- a/PhysicsTools/PatExamples/BuildFile.xml
+++ b/PhysicsTools/PatExamples/BuildFile.xml
@@ -1,16 +1,12 @@
-<use   name="DataFormats/Math"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/JetReco"/>
 <use   name="DataFormats/MuonReco"/>
 <use   name="DataFormats/PatCandidates"/>
 <use   name="FWCore/Utilities"/>
-<use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="FWCore/ServiceRegistry"/>
 <use   name="PhysicsTools/PatUtils"/>
 <use   name="PhysicsTools/UtilAlgos"/>
-<use   name="PhysicsTools/Utilities"/>
-<use   name="CommonTools/CandUtils"/>
 <use   name="clhep"/>
 <export>
   <lib   name="1"/>
diff --git a/PhysicsTools/PatExamples/plugins/BuildFile.xml b/PhysicsTools/PatExamples/plugins/BuildFile.xml
index 29b9b688f062a..a141c8c05e72e 100644
--- a/PhysicsTools/PatExamples/plugins/BuildFile.xml
+++ b/PhysicsTools/PatExamples/plugins/BuildFile.xml
@@ -1,6 +1,7 @@
 <export>
 </export>
 <library   name="PhysicsToolsPatExamples_plugins" file="*.cc">
+  <use   name="CommonTools/CandUtils"/>
   <use   name="FWCore/Framework"/>
   <use   name="FWCore/ParameterSet"/>
   <use   name="FWCore/MessageLogger"/>
diff --git a/PhysicsTools/RecoUtils/BuildFile.xml b/PhysicsTools/RecoUtils/BuildFile.xml
index 545afb6f2c142..e13ac40f133c2 100644
--- a/PhysicsTools/RecoUtils/BuildFile.xml
+++ b/PhysicsTools/RecoUtils/BuildFile.xml
@@ -1,7 +1,6 @@
 <use   name="RecoVertex/VertexPrimitives"/>
 <use   name="RecoVertex/KinematicFit"/>
 <use   name="TrackingTools/TransientTrack"/>
-<use   name="MagneticField/Records"/>
 <use   name="RecoTracker/Record" />
 <use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="DataFormats/RecoCandidate"/>
@@ -9,7 +8,6 @@
 <use   name="PhysicsTools/KinFitter"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="boost"/>
-<use   name="DataFormats/VertexReco"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/PhysicsTools/RooStatsCms/BuildFile.xml b/PhysicsTools/RooStatsCms/BuildFile.xml
index b929c681ad319..0a2945bea49a9 100644
--- a/PhysicsTools/RooStatsCms/BuildFile.xml
+++ b/PhysicsTools/RooStatsCms/BuildFile.xml
@@ -1,6 +1,3 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
 <use   name="root"/>
 <use   name="rootmath"/>
 <lib   name="Graf"/>
diff --git a/PhysicsTools/SelectorUtils/BuildFile.xml b/PhysicsTools/SelectorUtils/BuildFile.xml
index 798751bdf601f..71b940043e398 100644
--- a/PhysicsTools/SelectorUtils/BuildFile.xml
+++ b/PhysicsTools/SelectorUtils/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="CommonTools/Utils"/>
-<use name="DataFormats/Math"/>
 <use name="DataFormats/Candidate"/>
 <use name="DataFormats/PatCandidates"/>
 <use name="DataFormats/EgammaCandidates"/>
@@ -10,7 +9,6 @@
 <use name="DataFormats/Provenance"/>
 <use name="DataFormats/VertexReco"/>
 <use name="FWCore/Common"/>
-<use name="FWCore/FWLite"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 
@@ -20,7 +18,6 @@
 <export>
   <lib name="1"/>
   <use name="CommonTools/Utils"/>
-  <use name="DataFormats/Math"/>
   <use name="DataFormats/Candidate"/>
   <use name="DataFormats/PatCandidates"/>
   <use name="DataFormats/BeamSpot"/>
@@ -28,7 +25,6 @@
   <use name="DataFormats/Provenance"/>
   <use name="DataFormats/VertexReco"/>
   <use name="FWCore/Common"/>
-  <use name="FWCore/FWLite"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/Utilities"/>
   <use name="openssl"/>
diff --git a/PhysicsTools/TagAndProbe/BuildFile.xml b/PhysicsTools/TagAndProbe/BuildFile.xml
index 433a38c1a3e95..4e20741869f19 100644
--- a/PhysicsTools/TagAndProbe/BuildFile.xml
+++ b/PhysicsTools/TagAndProbe/BuildFile.xml
@@ -1,17 +1,12 @@
 <use   name="roofit"/>
 <use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/EgammaReco"/>
 <use   name="DataFormats/METReco"/>
 <use   name="DataFormats/Math"/>
-<use   name="DataFormats/RecoCandidate"/>
 <use   name="DataFormats/Candidate"/>
 <use   name="DataFormats/Common"/>
 <use   name="CommonTools/Utils"/>
 <use   name="CommonTools/UtilAlgos"/>
-<use   name="PhysicsTools/UtilAlgos"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/PhysicsTools/TensorFlow/BuildFile.xml b/PhysicsTools/TensorFlow/BuildFile.xml
index b1a7041c1d6e7..97c9cc8d38d4f 100644
--- a/PhysicsTools/TensorFlow/BuildFile.xml
+++ b/PhysicsTools/TensorFlow/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="tensorflow-cc" />
 
-<use name="FWCore/Framework" />
 <use name="FWCore/Utilities" />
 <use name="FWCore/Concurrency" />
 
diff --git a/PhysicsTools/UtilAlgos/BuildFile.xml b/PhysicsTools/UtilAlgos/BuildFile.xml
index aeba8620cb1ba..85a9f85a587ea 100644
--- a/PhysicsTools/UtilAlgos/BuildFile.xml
+++ b/PhysicsTools/UtilAlgos/BuildFile.xml
@@ -2,7 +2,6 @@
 <use   name="FWCore/MessageLogger"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Services"/>
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/Common"/>
 <use   name="DataFormats/Common"/>

From 331a10e69ad7f9a146b92f60c9b44cc22e4b5b86 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Wed, 22 Jan 2020 19:49:16 +0100
Subject: [PATCH 2/3] remove unused dependencies from RecoEgamma

---
 RecoEgamma/EgammaElectronAlgos/BuildFile.xml  |  1 -
 RecoEgamma/EgammaPhotonAlgos/BuildFile.xml    |  2 --
 RecoEgamma/EgammaTools/BuildFile.xml          |  1 -
 RecoEgamma/Examples/BuildFile.xml             | 28 -------------------
 RecoEgamma/Examples/plugins/BuildFile.xml     |  2 +-
 RecoEgamma/PhotonIdentification/BuildFile.xml |  1 -
 6 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 RecoEgamma/Examples/BuildFile.xml

diff --git a/RecoEgamma/EgammaElectronAlgos/BuildFile.xml b/RecoEgamma/EgammaElectronAlgos/BuildFile.xml
index e941a0b9b8396..a05b4d7a79b37 100644
--- a/RecoEgamma/EgammaElectronAlgos/BuildFile.xml
+++ b/RecoEgamma/EgammaElectronAlgos/BuildFile.xml
@@ -23,7 +23,6 @@
 <use   name="RecoEgamma/EgammaTools"/>
 <use   name="RecoEgamma/EgammaIsolationAlgos"/>
 <use   name="RecoEgamma/ElectronIdentification"/>
-<use   name="TrackingTools/MeasurementDet"/>
 <use   name="RecoTracker/TkTrackingRegions"/>
 <use   name="CondFormats/EgammaObjects"/>
 <use   name="CondFormats/DataRecord"/>
diff --git a/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml b/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml
index 3bf8347e2a83f..a12cb7bc14ac1 100644
--- a/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml
+++ b/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml
@@ -4,7 +4,6 @@
 <use   name="Geometry/CaloGeometry"/>
 <use   name="Geometry/CaloTopology"/>
 <use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/DetId"/>
 <use   name="CommonTools/CandAlgos"/>
 <use   name="RecoEgamma/EgammaTools"/>
 <use   name="DataFormats/Math"/>
@@ -19,7 +18,6 @@
 <use   name="TrackingTools/DetLayers"/>
 <use   name="TrackingTools/TransientTrack"/>
 <use   name="RecoTracker/MeasurementDet"/>
-<use   name="RecoTracker/TkTrackingRegions"/>
 <use   name="RecoTracker/CkfPattern"/>
 <use   name="RecoTracker/TkSeedGenerator"/>
 <use   name="RecoVertex/VertexPrimitives"/>
diff --git a/RecoEgamma/EgammaTools/BuildFile.xml b/RecoEgamma/EgammaTools/BuildFile.xml
index b68da922f2348..0098fff81aa4a 100644
--- a/RecoEgamma/EgammaTools/BuildFile.xml
+++ b/RecoEgamma/EgammaTools/BuildFile.xml
@@ -10,7 +10,6 @@
 <use   name="CondFormats/DataRecord"/>
 <use   name="CondFormats/EgammaObjects"/>
 <use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="CondCore/DBOutputService"/>
 <use   name="DataFormats/ParticleFlowReco"/>
 <use   name="CommonTools/Utils"/>
 <export>
diff --git a/RecoEgamma/Examples/BuildFile.xml b/RecoEgamma/Examples/BuildFile.xml
deleted file mode 100644
index 7a49c96029df3..0000000000000
--- a/RecoEgamma/Examples/BuildFile.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<use   name="RecoEgamma/EgammaElectronAlgos"/>
-<use   name="RecoEgamma/EgammaMCTools"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="hepmc"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
-<export>
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="DQMServices/Components"/>
-  <use name="DQMServices/Core"/>
-  <lib name="1"/>
-</export>
\ No newline at end of file
diff --git a/RecoEgamma/Examples/plugins/BuildFile.xml b/RecoEgamma/Examples/plugins/BuildFile.xml
index 0732c195d268b..1f7323a718f89 100644
--- a/RecoEgamma/Examples/plugins/BuildFile.xml
+++ b/RecoEgamma/Examples/plugins/BuildFile.xml
@@ -1,4 +1,3 @@
-<use   name="RecoEgamma/Examples"/>
 <use   name="RecoEgamma/EgammaElectronAlgos"/>
 <use   name="RecoEgamma/EgammaMCTools"/>
 <use   name="RecoEcal/EgammaCoreTools"/>
@@ -40,6 +39,7 @@
 <use   name="DataFormats/TrackReco"/>
 <use   name="DataFormats/TrajectoryState"/>
 <use   name="DataFormats/VertexReco"/>
+<use   name="DQMServices/Core"/>
 <use   name="SimDataFormats/CrossingFrame"/>
 <use   name="SimDataFormats/GeneratorProducts"/>
 <use   name="SimDataFormats/Track"/>
diff --git a/RecoEgamma/PhotonIdentification/BuildFile.xml b/RecoEgamma/PhotonIdentification/BuildFile.xml
index a7bf10f9deb3c..932438a457a68 100644
--- a/RecoEgamma/PhotonIdentification/BuildFile.xml
+++ b/RecoEgamma/PhotonIdentification/BuildFile.xml
@@ -1,5 +1,4 @@
 <use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
 <use   name="DataFormats/HcalRecHit"/>
 <use   name="DataFormats/EgammaReco"/>
 <use   name="DataFormats/PatCandidates"/>

From f3df3fa18cfc019074a6f8be9afffe66e04896b3 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Thu, 23 Jan 2020 02:06:08 +0100
Subject: [PATCH 3/3] fix header inconsistency with DataFormats/CLHEP

---
 PhysicsTools/FWLite/BuildFile.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PhysicsTools/FWLite/BuildFile.xml b/PhysicsTools/FWLite/BuildFile.xml
index f9bae23790de4..67c439dc47f6b 100644
--- a/PhysicsTools/FWLite/BuildFile.xml
+++ b/PhysicsTools/FWLite/BuildFile.xml
@@ -3,6 +3,7 @@
 <use   name="roothistmatrix"/>
 <use   name="CommonTools/Utils"/>
 <use   name="DataFormats/FWLite"/>
+<use   name="DataFormats/PatCandidates"/>
 <export>
   <lib   name="1"/>
 </export>