From 21f7807e33a957b27e1871062f25fffccd87fa47 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Sat, 17 Jul 2021 11:51:07 +0200
Subject: [PATCH 1/2] Remove unused boost dependencies from Validation
 BuildFiles

---
 Validation/CaloTowers/BuildFile.xml               | 1 -
 Validation/CheckOverlap/BuildFile.xml             | 1 -
 Validation/EcalHits/BuildFile.xml                 | 1 -
 Validation/EcalRecHits/BuildFile.xml              | 1 -
 Validation/Geometry/BuildFile.xml                 | 1 -
 Validation/HcalDigis/BuildFile.xml                | 1 -
 Validation/HcalHits/BuildFile.xml                 | 1 -
 Validation/HcalHits/plugins/BuildFile.xml         | 1 -
 Validation/HcalRecHits/BuildFile.xml              | 1 -
 Validation/HcalRecHits/test/BuildFile.xml         | 1 -
 Validation/MuonGEMHits/BuildFile.xml              | 1 -
 Validation/MuonGEMRecHits/BuildFile.xml           | 1 -
 Validation/MuonME0Validation/BuildFile.xml        | 1 -
 Validation/RecoB/plugins/BuildFile.xml            | 1 -
 Validation/RecoMuon/plugins/BuildFile.xml         | 1 -
 Validation/RecoPixelVertexing/test/BuildFile.xml  | 1 -
 Validation/RecoTrack/plugins/BuildFile.xml        | 1 -
 Validation/RecoVertex/BuildFile.xml               | 1 -
 Validation/SiTrackerPhase2V/plugins/BuildFile.xml | 1 -
 Validation/TrackerDigis/plugins/BuildFile.xml     | 1 -
 Validation/TrackerRecHits/BuildFile.xml           | 1 -
 Validation/TrackingMCTruth/plugins/BuildFile.xml  | 1 -
 22 files changed, 22 deletions(-)

diff --git a/Validation/CaloTowers/BuildFile.xml b/Validation/CaloTowers/BuildFile.xml
index eef07500474f1..a029b59648204 100644
--- a/Validation/CaloTowers/BuildFile.xml
+++ b/Validation/CaloTowers/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DQMServices/Core"/>
-<use name="boost"/>
 <use name="root"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/HcalDetId"/>
diff --git a/Validation/CheckOverlap/BuildFile.xml b/Validation/CheckOverlap/BuildFile.xml
index bc9769d3f0510..9cd2af0783598 100644
--- a/Validation/CheckOverlap/BuildFile.xml
+++ b/Validation/CheckOverlap/BuildFile.xml
@@ -4,4 +4,3 @@
 <use name="Geometry/Records"/>
 <use name="FWCore/ParameterSet"/>
 <use name="geant4core"/>
-<use name="boost"/>
diff --git a/Validation/EcalHits/BuildFile.xml b/Validation/EcalHits/BuildFile.xml
index c900b16c859b8..88c6e6a84715e 100644
--- a/Validation/EcalHits/BuildFile.xml
+++ b/Validation/EcalHits/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="root"/>
 <use name="geant4core"/>
-<use name="boost"/>
 <use name="FWCore/ParameterSet"/>
 <use name="SimG4Core/Watcher"/>
 <use name="SimG4CMS/Calo"/>
diff --git a/Validation/EcalRecHits/BuildFile.xml b/Validation/EcalRecHits/BuildFile.xml
index 78d818c076ae5..f1941e14a5fd4 100644
--- a/Validation/EcalRecHits/BuildFile.xml
+++ b/Validation/EcalRecHits/BuildFile.xml
@@ -9,6 +9,5 @@
 <use name="DataFormats/EcalDetId"/>
 <use name="FWCore/Framework"/>
 <use name="DQMServices/Core"/>
-<use name="boost"/>
 <use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/Validation/Geometry/BuildFile.xml b/Validation/Geometry/BuildFile.xml
index 866596d01a790..4d85e89cf666b 100644
--- a/Validation/Geometry/BuildFile.xml
+++ b/Validation/Geometry/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="root"/>
 <use name="dd4hep"/>
 <use name="geant4core"/>
-<use name="boost"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
diff --git a/Validation/HcalDigis/BuildFile.xml b/Validation/HcalDigis/BuildFile.xml
index 7fa4240ffdaab..321305a007529 100644
--- a/Validation/HcalDigis/BuildFile.xml
+++ b/Validation/HcalDigis/BuildFile.xml
@@ -1,5 +1,4 @@
 <flags EDM_PLUGIN="1"/>
-<use name="boost"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="Geometry/HcalTowerAlgo"/>
diff --git a/Validation/HcalHits/BuildFile.xml b/Validation/HcalHits/BuildFile.xml
index 15c3308736bd0..4e899ab890939 100644
--- a/Validation/HcalHits/BuildFile.xml
+++ b/Validation/HcalHits/BuildFile.xml
@@ -14,6 +14,5 @@
 <use name="SimG4Core/Watcher"/>
 <use name="geant4core"/>
 <use name="hepmc"/>
-<use name="boost"/>
 <use name="rootmath"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/Validation/HcalHits/plugins/BuildFile.xml b/Validation/HcalHits/plugins/BuildFile.xml
index 77e19a7300d32..d4ada06ef69ab 100644
--- a/Validation/HcalHits/plugins/BuildFile.xml
+++ b/Validation/HcalHits/plugins/BuildFile.xml
@@ -9,7 +9,6 @@
 <use name="SimDataFormats/CaloHit"/>
 <use name="SimDataFormats/ValidationFormats"/>
 <use name="geant4core"/>
-<use name="boost"/>
 <use name="hepmc"/>
 <use name="clhep"/>
 <use name="root"/>
diff --git a/Validation/HcalRecHits/BuildFile.xml b/Validation/HcalRecHits/BuildFile.xml
index 5b5d47e414d1a..3592c1e49f552 100644
--- a/Validation/HcalRecHits/BuildFile.xml
+++ b/Validation/HcalRecHits/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DQMServices/Core"/>
-<use name="boost"/>
 <use name="root"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/HcalDetId"/>
diff --git a/Validation/HcalRecHits/test/BuildFile.xml b/Validation/HcalRecHits/test/BuildFile.xml
index 086e27659843f..5a67665c59d98 100644
--- a/Validation/HcalRecHits/test/BuildFile.xml
+++ b/Validation/HcalRecHits/test/BuildFile.xml
@@ -8,7 +8,6 @@
 <use name="Geometry/Records"/>
 <use name="SimDataFormats/CaloHit"/>
 <use name="SimDataFormats/CaloTest"/>
-<use name="boost"/>
 <use name="root"/>
 <flags EDM_PLUGIN="1"/>
 <library file="*.cc" name="testValidationHcalRecHits">
diff --git a/Validation/MuonGEMHits/BuildFile.xml b/Validation/MuonGEMHits/BuildFile.xml
index 9428fed18dda7..70f59b61f8c10 100644
--- a/Validation/MuonGEMHits/BuildFile.xml
+++ b/Validation/MuonGEMHits/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="boost"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
diff --git a/Validation/MuonGEMRecHits/BuildFile.xml b/Validation/MuonGEMRecHits/BuildFile.xml
index c5b66fef4a563..5f32c1c72f7a1 100644
--- a/Validation/MuonGEMRecHits/BuildFile.xml
+++ b/Validation/MuonGEMRecHits/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="boost"/>
 <use name="DataFormats/GEMRecHit"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
diff --git a/Validation/MuonME0Validation/BuildFile.xml b/Validation/MuonME0Validation/BuildFile.xml
index f580d830d3f32..b85946a925413 100644
--- a/Validation/MuonME0Validation/BuildFile.xml
+++ b/Validation/MuonME0Validation/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="boost"/>
 <use name="DataFormats/GEMDigi"/>
 <use name="DataFormats/GEMRecHit"/>
 <use name="DataFormats/Scalers"/>
diff --git a/Validation/RecoB/plugins/BuildFile.xml b/Validation/RecoB/plugins/BuildFile.xml
index fb6b81322a4e9..e0d1d3020eefa 100644
--- a/Validation/RecoB/plugins/BuildFile.xml
+++ b/Validation/RecoB/plugins/BuildFile.xml
@@ -14,7 +14,6 @@
 <use name="DQMOffline/RecoB"/>
 <use name="Validation/RecoB"/>
 <use name="DataFormats/PatCandidates"/>
-<use name="boost"/>
 <use name="clhep"/>
 <use name="rootcore"/>
 <use name="root"/>
diff --git a/Validation/RecoMuon/plugins/BuildFile.xml b/Validation/RecoMuon/plugins/BuildFile.xml
index 798b96a677365..44f272c4ebb8a 100644
--- a/Validation/RecoMuon/plugins/BuildFile.xml
+++ b/Validation/RecoMuon/plugins/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="FWCore/Framework"/>
 <use name="DataFormats/TrackReco"/>
 <use name="clhep"/>
-<use name="boost"/>
 <use name="DQMServices/Core"/>
 <use name="FWCore/ParameterSet"/>
 <use name="MagneticField/Records"/>
diff --git a/Validation/RecoPixelVertexing/test/BuildFile.xml b/Validation/RecoPixelVertexing/test/BuildFile.xml
index 43af3053dde94..4a0125e47dd23 100644
--- a/Validation/RecoPixelVertexing/test/BuildFile.xml
+++ b/Validation/RecoPixelVertexing/test/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="boost"/>
 <use name="root"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
diff --git a/Validation/RecoTrack/plugins/BuildFile.xml b/Validation/RecoTrack/plugins/BuildFile.xml
index be450b693624b..0cd8b0b15dc91 100644
--- a/Validation/RecoTrack/plugins/BuildFile.xml
+++ b/Validation/RecoTrack/plugins/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackReco"/>
 <use name="clhep"/>
-<use name="boost"/>
 <use name="SimDataFormats/TrackerDigiSimLink"/>
 <use name="FWCore/ParameterSet"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/Validation/RecoVertex/BuildFile.xml b/Validation/RecoVertex/BuildFile.xml
index 946d9cb48b7fa..c7e0c6d1d1103 100644
--- a/Validation/RecoVertex/BuildFile.xml
+++ b/Validation/RecoVertex/BuildFile.xml
@@ -26,7 +26,6 @@
 <use name="CommonTools/TriggerUtils"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="clhep"/>
-<use name="boost"/>
 <use name="hepmc"/>
 <use name="RecoVertex/PrimaryVertexProducer"/>
 <use name="RecoVertex/VertexTools"/>
diff --git a/Validation/SiTrackerPhase2V/plugins/BuildFile.xml b/Validation/SiTrackerPhase2V/plugins/BuildFile.xml
index 94659e6ef2e2e..50817c6c3a4c6 100644
--- a/Validation/SiTrackerPhase2V/plugins/BuildFile.xml
+++ b/Validation/SiTrackerPhase2V/plugins/BuildFile.xml
@@ -18,6 +18,5 @@
 <use name="DQMServices/Core"/>
 <use name="DQM/SiTrackerPhase2"/>
 <use name="Validation/SiTrackerPhase2V"/>
-<use name="boost_system"/>
 <use name="rootcling"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/Validation/TrackerDigis/plugins/BuildFile.xml b/Validation/TrackerDigis/plugins/BuildFile.xml
index c4b015cacfb1a..98243372a54d1 100644
--- a/Validation/TrackerDigis/plugins/BuildFile.xml
+++ b/Validation/TrackerDigis/plugins/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="Geometry/Records"/>
 <use name="RecoTracker/Record"/>
 <use name="RecoTracker/TkDetLayers"/>
-<use name="boost"/>
 <use name="root"/>
 <library file="*.cc" name="ValidationTrackerDigisPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/Validation/TrackerRecHits/BuildFile.xml b/Validation/TrackerRecHits/BuildFile.xml
index bdc5e0d1c8fd2..3151c270a820f 100644
--- a/Validation/TrackerRecHits/BuildFile.xml
+++ b/Validation/TrackerRecHits/BuildFile.xml
@@ -7,6 +7,5 @@
 <use name="CalibFormats/SiStripObjects"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="Geometry/Records"/>
-<use name="boost"/>
 <use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/Validation/TrackingMCTruth/plugins/BuildFile.xml b/Validation/TrackingMCTruth/plugins/BuildFile.xml
index b4fd5584ea947..516ac2d85bac4 100644
--- a/Validation/TrackingMCTruth/plugins/BuildFile.xml
+++ b/Validation/TrackingMCTruth/plugins/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="SimDataFormats/TrackingAnalysis"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="boost"/>
 <use name="root"/>
 <use name="clhep"/>
 <library file="*.cc" name="ValidationTrackingMCTruthPlugins">

From 78faeddb90d68ac19aa4f51aa4712d0825312fcc Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Sat, 17 Jul 2021 11:56:40 +0200
Subject: [PATCH 2/2] Clean unused dependencies from BuildFiles

---
 CalibTracker/SiStripESProducers/BuildFile.xml         | 2 --
 CalibTracker/SiStripESProducers/plugins/BuildFile.xml | 4 ++++
 CalibTracker/SiStripQuality/plugins/BuildFile.xml     | 1 -
 DQM/TrackerRemapper/test/BuildFile.xml                | 2 --
 Geometry/CaloTopology/BuildFile.xml                   | 1 -
 L1Trigger/L1TTrackMatch/plugins/BuildFile.xml         | 3 ---
 RecoEgamma/EgammaIsolationAlgos/BuildFile.xml         | 1 -
 RecoMuon/L2MuonProducer/plugins/BuildFile.xml         | 1 -
 SimG4Core/Application/BuildFile.xml                   | 1 -
 9 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/CalibTracker/SiStripESProducers/BuildFile.xml b/CalibTracker/SiStripESProducers/BuildFile.xml
index e0d3ea5b7128c..c4c2bdb094100 100644
--- a/CalibTracker/SiStripESProducers/BuildFile.xml
+++ b/CalibTracker/SiStripESProducers/BuildFile.xml
@@ -1,11 +1,9 @@
-<use name="CalibFormats/SiStripObjects"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="DataFormats/SiStripCommon"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="DQMServices/Core"/>
 <use name="boost"/>
 <export>
   <lib name="1"/>
diff --git a/CalibTracker/SiStripESProducers/plugins/BuildFile.xml b/CalibTracker/SiStripESProducers/plugins/BuildFile.xml
index 472c63983f361..e0642c6559049 100644
--- a/CalibTracker/SiStripESProducers/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripESProducers/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <library file="fake/*.cc" name="CalibTrackerSiStripFakeESProducersPlugins">
+  <use name="CalibFormats/SiStripObjects"/>
   <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripCommon"/>
   <use name="CalibTracker/SiStripESProducers"/>
@@ -8,6 +9,7 @@
 </library>
 
 <library file="real/*.cc" name="CalibTrackerSiStripRealESProducersPlugins">
+  <use name="CalibFormats/SiStripObjects"/>
   <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripCommon"/>
   <use name="CalibTracker/SiStripESProducers"/>
@@ -16,6 +18,7 @@
 </library>
 
 <library file="geom/*.cc" name="CalibTrackerSiStripGeomESProducersPlugins">
+  <use name="CalibFormats/SiStripObjects"/>
   <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripESProducers"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
@@ -24,6 +27,7 @@
 </library>
 
 <library file="DBWriter/*.cc" name="CalibTrackerSiStripESProducersDBWriterPlugins">
+  <use name="CalibFormats/SiStripObjects"/>
   <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripESProducers"/>
   <use name="CondCore/DBOutputService"/>
diff --git a/CalibTracker/SiStripQuality/plugins/BuildFile.xml b/CalibTracker/SiStripQuality/plugins/BuildFile.xml
index d11242b1cc50d..8fe3f15ec9e6b 100644
--- a/CalibTracker/SiStripQuality/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripQuality/plugins/BuildFile.xml
@@ -8,7 +8,6 @@
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>
-<use name="CalibTracker/SiStripESProducers"/>
 <use name="CalibTracker/SiStripQuality"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrackerRecHit2D"/>
diff --git a/DQM/TrackerRemapper/test/BuildFile.xml b/DQM/TrackerRemapper/test/BuildFile.xml
index d559e851120e3..20d95c95f88d5 100644
--- a/DQM/TrackerRemapper/test/BuildFile.xml
+++ b/DQM/TrackerRemapper/test/BuildFile.xml
@@ -1,7 +1,5 @@
 <bin file="test_catch2_*.cc" name="test_catch2_DQM_TRACKERREMAPPER">
-  <use name="FWCore/Common"/>
   <use name="DQM/TrackerRemapper"/>
-  <use name="CalibTracker/StandaloneTrackerTopology"/>
   <use name="CalibTracker/SiPixelESProducers"/>
   <use name="CalibTracker/SiStripCommon"/>
   <use name="rootgraphics"/>
diff --git a/Geometry/CaloTopology/BuildFile.xml b/Geometry/CaloTopology/BuildFile.xml
index 27eb7048e3223..cf2845043f1d2 100644
--- a/Geometry/CaloTopology/BuildFile.xml
+++ b/Geometry/CaloTopology/BuildFile.xml
@@ -6,7 +6,6 @@
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/HcalCommonData"/>
 <use name="Geometry/HGCalCommonData"/>
-<use name="FWCore/Framework"/>
 <use name="boost"/>
 <export>
   <lib name="1"/>
diff --git a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
index 66dc30e472bb0..9df04b788760c 100644
--- a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
+++ b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
@@ -3,9 +3,6 @@
 <use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="Geometry/Records"/>
 <use   name="L1Trigger/L1TTrackMatch"/>
-<use   name="L1Trigger/TrackTrigger"/>
-<use   name="PhysicsTools/UtilAlgos"/>
-<use   name="SimGeneral/HepPDTRecord"/>
 <use   name="SimDataFormats/GeneratorProducts"/>
 <use   name="SimTracker/TrackTriggerAssociation"/>
 <use   name="DataFormats/L1TrackTrigger"/>
diff --git a/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml b/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml
index 0e0ddaa7c8867..1791ac1567bfc 100644
--- a/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml
+++ b/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="FWCore/MessageLogger"/>
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/CaloTopology"/>
-<use name="RecoCaloTools/Selectors" source_only="1"/>
 <use name="DataFormats/Candidate"/>
 <use name="DataFormats/RecoCandidate"/>
 <use name="DataFormats/ParticleFlowReco"/>
diff --git a/RecoMuon/L2MuonProducer/plugins/BuildFile.xml b/RecoMuon/L2MuonProducer/plugins/BuildFile.xml
index 0579ef2f7b667..c2effc61a5fd6 100644
--- a/RecoMuon/L2MuonProducer/plugins/BuildFile.xml
+++ b/RecoMuon/L2MuonProducer/plugins/BuildFile.xml
@@ -6,7 +6,6 @@
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="RecoMuon/StandAloneTrackFinder"/>
   <use name="RecoMuon/TrackingTools"/>
   <use name="TrackingTools/PatternTools"/>
diff --git a/SimG4Core/Application/BuildFile.xml b/SimG4Core/Application/BuildFile.xml
index aec4d612af357..3cfcb2f37ab68 100644
--- a/SimG4Core/Application/BuildFile.xml
+++ b/SimG4Core/Application/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="DataFormats/Common"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="SimDataFormats/Forward"/>
 <use name="SimG4Core/Generators"/>